Adding upstream version 2.36.1.upstream/2.36.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

10 files changed, 175 insertions, 0 deletions

diff --git a/tests/expected/utmp/last-dns b/tests/expected/utmp/last-dns
new file mode 100644
index 0000000..34012c7
--- /dev/null
+++ b/tests/expected/utmp/last-dns
@@ -0,0 +1,12 @@
+~~~ dns short ~~~
+IPv4     root         a.root-servers.n Wed Aug 28 13:00 - 14:00  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ dns long ~~~
+IPv4     root         a.root-servers.net Wed Aug 28 13:00 - 14:00  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ dns host last ~~~
+IPv4     root         Wed Aug 28 13:00 - 14:00  (01:00)     a.root-servers.net
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
diff --git a/tests/expected/utmp/last-ipv6-dns b/tests/expected/utmp/last-ipv6-dns
new file mode 100644
index 0000000..aa53a64
--- /dev/null
+++ b/tests/expected/utmp/last-ipv6-dns
@@ -0,0 +1,12 @@
+~~~ dns short ~~~
+IPv6     root         a.root-servers.n Wed Aug 28 20:30 - 20:40  (00:10)
+
+wtmp-ipv6 begins Wed Aug 28 20:30:40 2013
+~~~ dns long ~~~
+IPv6     root         a.root-servers.net Wed Aug 28 20:30 - 20:40  (00:10)
+
+wtmp-ipv6 begins Wed Aug 28 20:30:40 2013
+~~~ dns host last ~~~
+IPv6     root         Wed Aug 28 20:30 - 20:40  (00:10)     a.root-servers.net
+
+wtmp-ipv6 begins Wed Aug 28 20:30:40 2013
diff --git a/tests/expected/utmp/last-ipv6-nodns b/tests/expected/utmp/last-ipv6-nodns
new file mode 100644
index 0000000..65d422a
--- /dev/null
+++ b/tests/expected/utmp/last-ipv6-nodns
@@ -0,0 +1,8 @@
+~~~ show ip ~~~
+IPv6     root         2001:503:ba3e::2 Wed Aug 28 20:30 - 20:40  (00:10)
+
+wtmp-ipv6 begins Wed Aug 28 20:30:40 2013
+~~~ show ip last ~~~
+IPv6     root         Wed Aug 28 20:30 - 20:40  (00:10)     2001:503:ba3e::2:30
+
+wtmp-ipv6 begins Wed Aug 28 20:30:40 2013
diff --git a/tests/expected/utmp/last-nodns b/tests/expected/utmp/last-nodns
new file mode 100644
index 0000000..5b9171d
--- /dev/null
+++ b/tests/expected/utmp/last-nodns
@@ -0,0 +1,124 @@
+~~~ basic output ~~~
+rick     long         never-gonna-logo Thu Jan  1 00:00 - 03:14 (24855+03:14)
+torvalds linux        hobby            Mon Aug 26 00:57    gone - no logout
+reboot   system boot  system-name      Wed Aug 28 18:00   still running
+reboot   system boot  system-name      Wed Aug 28 16:00 - 17:00  (01:00)
+IPv4     root         dns-server       Wed Aug 28 13:00 - 14:00  (01:00)
+nonvalid foo          zero             Wed Aug 28 12:00 - down   (03:00)
+runlevel foo          one              Wed Aug 28 11:00 - 12:00  (01:00)
+sysboot  foo          two              Wed Aug 28 10:00 - 11:00  (01:00)
+newtime  foo          three            Wed Aug 28 09:00 - 10:00  (01:00)
+oldtime  foo          four             Wed Aug 28 08:00 - 09:00  (01:00)
+init     foo          five             Wed Aug 28 07:00 - 08:00  (01:00)
+login    foo          six              Wed Aug 28 06:00 - 07:00  (01:00)
+user_pro foo          seven            Wed Aug 28 05:00 - 06:00  (01:00)
+accounti foo          nine             Wed Aug 28 03:00 - 04:00  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ include system ~~~
+rick     long         never-gonna-logo Thu Jan  1 00:00 - 03:14 (24855+03:14)
+torvalds linux        hobby            Mon Aug 26 00:57    gone - no logout
+reboot   system boot  system-name      Wed Aug 28 18:00   still running
+shutdown system down  system-name      Wed Aug 28 17:00 - 18:00  (01:00)
+reboot   system boot  system-name      Wed Aug 28 16:00 - 17:00  (01:00)
+shutdown system down  system-name      Wed Aug 28 15:00 - 16:00  (01:00)
+IPv4     root         dns-server       Wed Aug 28 13:00 - 14:00  (01:00)
+nonvalid foo          zero             Wed Aug 28 12:00 - down   (03:00)
+runlevel foo          one              Wed Aug 28 11:00 - 12:00  (01:00)
+sysboot  foo          two              Wed Aug 28 10:00 - 11:00  (01:00)
+newtime  foo          three            Wed Aug 28 09:00 - 10:00  (01:00)
+oldtime  foo          four             Wed Aug 28 08:00 - 09:00  (01:00)
+init     foo          five             Wed Aug 28 07:00 - 08:00  (01:00)
+login    foo          six              Wed Aug 28 06:00 - 07:00  (01:00)
+user_pro foo          seven            Wed Aug 28 05:00 - 06:00  (01:00)
+accounti foo          nine             Wed Aug 28 03:00 - 04:00  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ show ip ~~~
+torvalds linux        128.214.205.14   Mon Aug 26 00:57    gone - no logout
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ no host ~~~
+torvalds linux        Mon Aug 26 00:57    gone - no logout
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ full times shortopt ~~~
+rick     long         never-gonna-logo Thu Jan  1 00:00:00 1970 - Tue Jan 19 03:14:07 2038 (24855+03:14)
+torvalds linux        hobby            Mon Aug 26 00:57:08 1991   gone - no logout
+reboot   system boot  system-name      Wed Aug 28 18:00:00 2013   still running
+reboot   system boot  system-name      Wed Aug 28 16:00:00 2013 - Wed Aug 28 17:00:00 2013  (01:00)
+IPv4     root         dns-server       Wed Aug 28 13:00:00 2013 - Wed Aug 28 14:00:00 2013  (01:00)
+nonvalid foo          zero             Wed Aug 28 12:00:00 2013 - down                      (03:00)
+runlevel foo          one              Wed Aug 28 11:00:00 2013 - Wed Aug 28 12:00:00 2013  (01:00)
+sysboot  foo          two              Wed Aug 28 10:00:00 2013 - Wed Aug 28 11:00:00 2013  (01:00)
+newtime  foo          three            Wed Aug 28 09:00:00 2013 - Wed Aug 28 10:00:00 2013  (01:00)
+oldtime  foo          four             Wed Aug 28 08:00:00 2013 - Wed Aug 28 09:00:00 2013  (01:00)
+init     foo          five             Wed Aug 28 07:00:00 2013 - Wed Aug 28 08:00:00 2013  (01:00)
+login    foo          six              Wed Aug 28 06:00:00 2013 - Wed Aug 28 07:00:00 2013  (01:00)
+user_pro foo          seven            Wed Aug 28 05:00:00 2013 - Wed Aug 28 06:00:00 2013  (01:00)
+accounti foo          nine             Wed Aug 28 03:00:00 2013 - Wed Aug 28 04:00:00 2013  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ full times longopt ~~~
+rick     long         never-gonna-logo Thu Jan  1 00:00:00 1970 - Tue Jan 19 03:14:07 2038 (24855+03:14)
+torvalds linux        hobby            Mon Aug 26 00:57:08 1991   gone - no logout
+reboot   system boot  system-name      Wed Aug 28 18:00:00 2013   still running
+reboot   system boot  system-name      Wed Aug 28 16:00:00 2013 - Wed Aug 28 17:00:00 2013  (01:00)
+IPv4     root         dns-server       Wed Aug 28 13:00:00 2013 - Wed Aug 28 14:00:00 2013  (01:00)
+nonvalid foo          zero             Wed Aug 28 12:00:00 2013 - down                      (03:00)
+runlevel foo          one              Wed Aug 28 11:00:00 2013 - Wed Aug 28 12:00:00 2013  (01:00)
+sysboot  foo          two              Wed Aug 28 10:00:00 2013 - Wed Aug 28 11:00:00 2013  (01:00)
+newtime  foo          three            Wed Aug 28 09:00:00 2013 - Wed Aug 28 10:00:00 2013  (01:00)
+oldtime  foo          four             Wed Aug 28 08:00:00 2013 - Wed Aug 28 09:00:00 2013  (01:00)
+init     foo          five             Wed Aug 28 07:00:00 2013 - Wed Aug 28 08:00:00 2013  (01:00)
+login    foo          six              Wed Aug 28 06:00:00 2013 - Wed Aug 28 07:00:00 2013  (01:00)
+user_pro foo          seven            Wed Aug 28 05:00:00 2013 - Wed Aug 28 06:00:00 2013  (01:00)
+accounti foo          nine             Wed Aug 28 03:00:00 2013 - Wed Aug 28 04:00:00 2013  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ no time ~~~
+rick     long         never-gonna-logo   (24855+03:14)
+torvalds linux        hobby              no logout
+reboot   system boot  system-name        running
+reboot   system boot  system-name         (01:00)
+IPv4     root         dns-server          (01:00)
+nonvalid foo          zero                (03:00)
+runlevel foo          one                 (01:00)
+sysboot  foo          two                 (01:00)
+newtime  foo          three               (01:00)
+oldtime  foo          four                (01:00)
+init     foo          five                (01:00)
+login    foo          six                 (01:00)
+user_pro foo          seven               (01:00)
+accounti foo          nine                (01:00)
+~~~ iso-8601 time ~~~
+rick     long         never-gonna-logout 1970-01-01T00:00:00+00:00 - 2038-01-19T03:14:07+00:00 (24855+03:14)
+torvalds linux        hobby            1991-08-26T00:57:08+00:00   gone - no logout
+reboot   system boot  system-name      2013-08-28T18:00:00+00:00   still running
+reboot   system boot  system-name      2013-08-28T16:00:00+00:00 - 2013-08-28T17:00:00+00:00  (01:00)
+IPv4     root         dns-server       2013-08-28T13:00:00+00:00 - 2013-08-28T14:00:00+00:00  (01:00)
+nonvalid foo          zero             2013-08-28T12:00:00+00:00 - down                       (03:00)
+runlevel foo          one              2013-08-28T11:00:00+00:00 - 2013-08-28T12:00:00+00:00  (01:00)
+sysboot  foo          two              2013-08-28T10:00:00+00:00 - 2013-08-28T11:00:00+00:00  (01:00)
+newtime  foo          three            2013-08-28T09:00:00+00:00 - 2013-08-28T10:00:00+00:00  (01:00)
+oldtime  foo          four             2013-08-28T08:00:00+00:00 - 2013-08-28T09:00:00+00:00  (01:00)
+init     foo          five             2013-08-28T07:00:00+00:00 - 2013-08-28T08:00:00+00:00  (01:00)
+login    foo          six              2013-08-28T06:00:00+00:00 - 2013-08-28T07:00:00+00:00  (01:00)
+user_process foo          seven            2013-08-28T05:00:00+00:00 - 2013-08-28T06:00:00+00:00  (01:00)
+accounting foo          nine             2013-08-28T03:00:00+00:00 - 2013-08-28T04:00:00+00:00  (01:00)
+
+wtmp-a begins 2013-08-28T03:00:00+00:00
+~~~ since and until ~~~
+oldtime  foo          four             Wed Aug 28 08:00    gone - no logout
+init     foo          five             Wed Aug 28 07:00 - 08:00  (01:00)
+login    foo          six              Wed Aug 28 06:00 - 07:00  (01:00)
+user_pro foo          seven            Wed Aug 28 05:00 - 06:00  (01:00)
+accounti foo          nine             Wed Aug 28 03:00 - 04:00  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
+~~~ present ~~~
+rick     long         never-gonna-logo Thu Jan  1 00:00 - 03:14 (24855+03:14)
+torvalds linux        hobby            Mon Aug 26 00:57    gone - no logout
+runlevel foo          one              Wed Aug 28 11:00 - 12:00  (01:00)
+
+wtmp-a begins Wed Aug 28 03:00:00 2013
diff --git a/tests/expected/utmp/utmpdump-circle b/tests/expected/utmp/utmpdump-circle
new file mode 100644
index 0000000..96fd2a9
--- /dev/null
+++ b/tests/expected/utmp/utmpdump-circle
@@ -0,0 +1 @@
+no output expected
diff --git a/tests/expected/utmp/utmpdump-subsecond b/tests/expected/utmp/utmpdump-subsecond
new file mode 100644
index 0000000..67d2cf8
--- /dev/null
+++ b/tests/expected/utmp/utmpdump-subsecond
@@ -0,0 +1,4 @@
+last 9 is expected to disappear in conversion
+[7] [00010] [ipv6] [IPv6    ] [root        ] [dns-server          ] [2001:503:ba3e::2:30] [2013-08-28T20:30:40,123456+00:00]
+[8] [00011] [ipv6] [IPv6    ] [root        ] [dns-server          ] [2001:503:ba3e::2:30] [2013-08-28T20:40:50,999999+00:00]
+[0] [00000] [ts/0] [nonvalid] [foo         ] [zero                ] [0.0.0.0        ] [2013-08-28T12:00:00,12345678+00:00]
diff --git a/tests/expected/utmp/utmpdump-tobin b/tests/expected/utmp/utmpdump-tobin
new file mode 100644
index 0000000..d0f1b61
--- /dev/null
+++ b/tests/expected/utmp/utmpdump-tobin
@@ -0,0 +1 @@
+no diff
diff --git a/tests/expected/utmp/utmpdump-tobin-ipv6 b/tests/expected/utmp/utmpdump-tobin-ipv6
new file mode 100644
index 0000000..d0f1b61
--- /dev/null
+++ b/tests/expected/utmp/utmpdump-tobin-ipv6
@@ -0,0 +1 @@
+no diff
diff --git a/tests/expected/utmp/utmpdump-totxt b/tests/expected/utmp/utmpdump-totxt
new file mode 100644
index 0000000..f929273
--- /dev/null
+++ b/tests/expected/utmp/utmpdump-totxt
@@ -0,0 +1,10 @@
+[7] [17058] [ts/1] [kerolasa] [pts/1       ] [:0.0                ] [0.0.0.0        ] [2013-01-16T23:44:09,000000+00:00]
+[7] [22098] [ts/2] [kerolasa] [pts/2       ] [:0.0                ] [0.0.0.0        ] [2013-01-16T23:49:17,000000+00:00]
+[7] [24915] [ts/3] [kerolasa] [pts/3       ] [:0.0                ] [0.0.0.0        ] [2013-01-17T12:23:33,000000+00:00]
+[8] [24915] [ts/3] [kerolasa] [pts/3       ] [                    ] [0.0.0.0        ] [2013-01-17T12:24:49,000000+00:00]
+[7] [30629] [ts/3] [kerolasa] [pts/3       ] [:0.0                ] [0.0.0.0        ] [2013-01-17T13:12:39,000000+00:00]
+[8] [30629] [ts/3] [kerolasa] [pts/3       ] [                    ] [0.0.0.0        ] [2013-01-17T13:42:19,000000+00:00]
+[8] [22098] [ts/2] [kerolasa] [pts/2       ] [                    ] [0.0.0.0        ] [2013-01-17T13:42:48,000000+00:00]
+[8] [17058] [ts/1] [kerolasa] [pts/1       ] [                    ] [0.0.0.0        ] [2013-01-17T13:42:48,000000+00:00]
+[7] [31545] [ts/1] [kerolasa] [pts/1       ] [:0.0                ] [0.0.0.0        ] [2013-01-17T20:17:21,000000+00:00]
+[7] [28496] [ts/2] [kerolasa] [pts/2       ] [:0.0                ] [0.0.0.0        ] [2013-01-17T21:09:39,000000+00:00]
diff --git a/tests/expected/utmp/utmpdump-totxt-ipv6 b/tests/expected/utmp/utmpdump-totxt-ipv6
new file mode 100644
index 0000000..cceb411
--- /dev/null
+++ b/tests/expected/utmp/utmpdump-totxt-ipv6
@@ -0,0 +1,2 @@
+[7] [00010] [ipv6] [IPv6    ] [root        ] [dns-server          ] [2001:503:ba3e::2:30] [2013-08-28T20:30:40,000000+00:00]
+[8] [00011] [ipv6] [IPv6    ] [root        ] [dns-server          ] [2001:503:ba3e::2:30] [2013-08-28T20:40:50,000000+00:00]