Wed May 20 21:21:55 UTC 2009

Author: nekral-guest
Date: 2009-05-20 21:21:55 +0000 (Wed, 20 May 2009)
New Revision: 2959

Removed:
   debian/trunk/tests/usertools/24_usermod_locked_passwd/data/group
   debian/trunk/tests/usertools/24_usermod_locked_passwd/data/gshadow
   debian/trunk/tests/usertools/24_usermod_locked_passwd/data/home_ls-a
   debian/trunk/tests/usertools/24_usermod_locked_passwd/data/passwd
   debian/trunk/tests/usertools/24_usermod_locked_passwd/data/shadow
   debian/trunk/tests/usertools/25_usermod-G_locked_group/data/group
   debian/trunk/tests/usertools/25_usermod-G_locked_group/data/gshadow
   debian/trunk/tests/usertools/25_usermod-G_locked_group/data/home_ls-a
   debian/trunk/tests/usertools/25_usermod-G_locked_group/data/passwd
   debian/trunk/tests/usertools/25_usermod-G_locked_group/data/shadow
   debian/trunk/tests/usertools/26_usermod_locked_shadow/data/group
   debian/trunk/tests/usertools/26_usermod_locked_shadow/data/gshadow
   debian/trunk/tests/usertools/26_usermod_locked_shadow/data/home_ls-a
   debian/trunk/tests/usertools/26_usermod_locked_shadow/data/passwd
   debian/trunk/tests/usertools/26_usermod_locked_shadow/data/shadow
   debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/group
   debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/gshadow
   debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/home_ls-a
   debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/passwd
   debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/shadow
   debian/trunk/tests/usertools/28_usermod-c_locked_group/data/group
   debian/trunk/tests/usertools/28_usermod-c_locked_group/data/gshadow
   debian/trunk/tests/usertools/28_usermod-c_locked_group/data/home_ls-a
   debian/trunk/tests/usertools/28_usermod-c_locked_group/data/shadow
   debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/group
   debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/gshadow
   debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/home_ls-a
   debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/shadow
   debian/trunk/tests/usertools/30_usermod-l_locked_group/data/group
   debian/trunk/tests/usertools/30_usermod-l_locked_group/data/gshadow
   debian/trunk/tests/usertools/30_usermod-l_locked_group/data/home_ls-a
   debian/trunk/tests/usertools/30_usermod-l_locked_group/data/passwd
   debian/trunk/tests/usertools/30_usermod-l_locked_group/data/shadow
   debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/group
   debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/gshadow
   debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/home_ls-a
   debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/passwd
   debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/shadow
Modified:
   debian/trunk/tests/usertools/24_usermod_locked_passwd/usermod.test
   debian/trunk/tests/usertools/25_usermod-G_locked_group/usermod.test
   debian/trunk/tests/usertools/26_usermod_locked_shadow/usermod.test
   debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/usermod.test
   debian/trunk/tests/usertools/28_usermod-c_locked_group/usermod.test
   debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/usermod.test
   debian/trunk/tests/usertools/30_usermod-l_locked_group/usermod.test
   debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/usermod.test
Log:
cleanup. Remove unneeded files.


Deleted: debian/trunk/tests/usertools/24_usermod_locked_passwd/data/group
===================================================================

--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/24_usermod_locked_passwd/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/24_usermod_locked_passwd/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/24_usermod_locked_passwd/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/24_usermod_locked_passwd/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/24_usermod_locked_passwd/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/24_usermod_locked_passwd/data/passwd
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/passwd	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/24_usermod_locked_passwd/data/passwd	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/false

Deleted: debian/trunk/tests/usertools/24_usermod_locked_passwd/data/shadow
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/24_usermod_locked_passwd/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/24_usermod_locked_passwd/usermod.test
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/24_usermod_locked_passwd/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -42,16 +42,16 @@
 rm -f tmp/usermod.err
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/usertools/25_usermod-G_locked_group/data/group
===================================================================
--- debian/trunk/tests/usertools/25_usermod-G_locked_group/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/25_usermod-G_locked_group/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/25_usermod-G_locked_group/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/25_usermod-G_locked_group/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/25_usermod-G_locked_group/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/25_usermod-G_locked_group/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/25_usermod-G_locked_group/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/25_usermod-G_locked_group/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/25_usermod-G_locked_group/data/passwd
===================================================================
--- debian/trunk/tests/usertools/25_usermod-G_locked_group/data/passwd	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/25_usermod-G_locked_group/data/passwd	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/false

Deleted: debian/trunk/tests/usertools/25_usermod-G_locked_group/data/shadow
===================================================================
--- debian/trunk/tests/usertools/25_usermod-G_locked_group/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/25_usermod-G_locked_group/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/25_usermod-G_locked_group/usermod.test
===================================================================
--- debian/trunk/tests/usertools/25_usermod-G_locked_group/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/25_usermod-G_locked_group/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -42,16 +42,16 @@
 rm -f tmp/usermod.err
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/usertools/26_usermod_locked_shadow/data/group
===================================================================
--- debian/trunk/tests/usertools/26_usermod_locked_shadow/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/26_usermod_locked_shadow/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/26_usermod_locked_shadow/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/26_usermod_locked_shadow/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/26_usermod_locked_shadow/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/26_usermod_locked_shadow/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/26_usermod_locked_shadow/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/26_usermod_locked_shadow/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/26_usermod_locked_shadow/data/passwd
===================================================================
--- debian/trunk/tests/usertools/26_usermod_locked_shadow/data/passwd	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/26_usermod_locked_shadow/data/passwd	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/false

Deleted: debian/trunk/tests/usertools/26_usermod_locked_shadow/data/shadow
===================================================================
--- debian/trunk/tests/usertools/26_usermod_locked_shadow/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/26_usermod_locked_shadow/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/26_usermod_locked_shadow/usermod.test
===================================================================
--- debian/trunk/tests/usertools/26_usermod_locked_shadow/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/26_usermod_locked_shadow/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -42,16 +42,16 @@
 rm -f tmp/usermod.err
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/passwd	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/passwd	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/false

Deleted: debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/usermod.test
===================================================================
--- debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -42,16 +42,16 @@
 rm -f tmp/usermod.err
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/usertools/28_usermod-c_locked_group/data/group
===================================================================
--- debian/trunk/tests/usertools/28_usermod-c_locked_group/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/28_usermod-c_locked_group/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/28_usermod-c_locked_group/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/28_usermod-c_locked_group/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/28_usermod-c_locked_group/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/28_usermod-c_locked_group/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/28_usermod-c_locked_group/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/28_usermod-c_locked_group/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/28_usermod-c_locked_group/data/shadow
===================================================================
--- debian/trunk/tests/usertools/28_usermod-c_locked_group/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/28_usermod-c_locked_group/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/28_usermod-c_locked_group/usermod.test
===================================================================
--- debian/trunk/tests/usertools/28_usermod-c_locked_group/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/28_usermod-c_locked_group/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -30,13 +30,13 @@
 ../../common/compare_file.pl data/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/usermod.test
===================================================================
--- debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/29_usermod-c_locked_gshadow/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -30,13 +30,13 @@
 ../../common/compare_file.pl data/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/usertools/30_usermod-l_locked_group/data/group
===================================================================
--- debian/trunk/tests/usertools/30_usermod-l_locked_group/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/30_usermod-l_locked_group/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/30_usermod-l_locked_group/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/30_usermod-l_locked_group/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/30_usermod-l_locked_group/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/30_usermod-l_locked_group/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/30_usermod-l_locked_group/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/30_usermod-l_locked_group/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/30_usermod-l_locked_group/data/passwd
===================================================================
--- debian/trunk/tests/usertools/30_usermod-l_locked_group/data/passwd	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/30_usermod-l_locked_group/data/passwd	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/false

Deleted: debian/trunk/tests/usertools/30_usermod-l_locked_group/data/shadow
===================================================================
--- debian/trunk/tests/usertools/30_usermod-l_locked_group/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/30_usermod-l_locked_group/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/30_usermod-l_locked_group/usermod.test
===================================================================
--- debian/trunk/tests/usertools/30_usermod-l_locked_group/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/30_usermod-l_locked_group/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -42,16 +42,16 @@
 rm -f tmp/usermod.err
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/group	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/group	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/gshadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/gshadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::

Deleted: debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/home_ls-a	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/home_ls-a	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'

Deleted: debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/passwd	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/passwd	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/false

Deleted: debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/shadow	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/shadow	2009-05-20 21:21:55 UTC (rev 2959)
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/usermod.test
===================================================================
--- debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/usermod.test	2009-05-20 05:40:31 UTC (rev 2958)
+++ debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/usermod.test	2009-05-20 21:21:55 UTC (rev 2959)
@@ -42,16 +42,16 @@
 rm -f tmp/usermod.err
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
+../../common/compare_file.pl config/etc/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"


