Tue Apr 14 22:26:30 UTC 2009

Author: nekral-guest
Date: 2009-04-14 22:26:30 +0000 (Tue, 14 Apr 2009)
New Revision: 2686

Added:
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/
   debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/
   debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/
   debian/trunk/tests/newusers/49_multiple_system_users/
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/
Removed:
   debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/group
   debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/gshadow
   debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/passwd
   debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/shadow
   debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/group
   debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/gshadow
   debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/passwd
   debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/shadow
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/group
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/gshadow
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/passwd
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/shadow
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/group
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/gshadow
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/passwd
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/shadow
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/group
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/gshadow
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/home_ls-a
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/passwd
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/shadow
Modified:
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config.txt
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/group
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/gshadow
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/passwd
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/shadow
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/group
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test
   debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/groupadd.err
   debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/groupadd.test
   debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/groupmod.err
   debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/groupmod.test
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.err
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.list
   debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/newusers.test
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.err
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.list
   debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/newusers.test
   debian/trunk/tests/newusers/49_multiple_system_users/config/etc/group
   debian/trunk/tests/newusers/49_multiple_system_users/config/etc/gshadow
   debian/trunk/tests/newusers/49_multiple_system_users/config/etc/passwd
   debian/trunk/tests/newusers/49_multiple_system_users/config/etc/shadow
   debian/trunk/tests/newusers/49_multiple_system_users/data/group
   debian/trunk/tests/newusers/49_multiple_system_users/data/gshadow
   debian/trunk/tests/newusers/49_multiple_system_users/data/passwd
   debian/trunk/tests/newusers/49_multiple_system_users/data/shadow
   debian/trunk/tests/newusers/49_multiple_system_users/newusers.test
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/usermod.err
   debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/usermod.test
Log:
Added tests for IDs set to -1
long username for gpasswd
and system users with newusers.


Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/group
===================================================================

--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -35,8 +35,8 @@
 plugdev:x:46:
 staff:x:50:
 games:x:60:
-users:x:100:foo
+users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:
+useruseruseruseruseruseruseruser:x:1000:

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -35,8 +35,8 @@
 plugdev:*::
 staff:*::
 games:*::
-users:*::foo
+users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
-foo:*::
+useruseruseruseruseruseruseruser:*::

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -17,4 +17,4 @@
 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:::/bin/false
+useruseruseruseruseruseruseruser:x:1000:1000:::/bin/false

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -17,4 +17,4 @@
 gnats:*:12977:0:99999:7:::
 nobody:*:12977:0:99999:7:::
 Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
+useruseruseruseruseruseruseruser:!:12977:0:99999:7:::

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config.txt
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config.txt	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config.txt	2009-04-14 22:26:30 UTC (rev 2686)
@@ -2,4 +2,4 @@
 # root password: rootF00barbaz
 # myuser password: myuserF00barbaz
 
-user foo, in group users
+user useruseruseruseruseruseruseruser, 32 chars

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,6 +1,6 @@
 root:x:0:
 daemon:x:1:
-bin:x:2:foo
+bin:x:2:useruseruseruseruseruseruseruser
 sys:x:3:
 adm:x:4:
 tty:x:5:
@@ -35,8 +35,8 @@
 plugdev:x:46:
 staff:x:50:
 games:x:60:
-users:x:100:foo
+users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:
+useruseruseruseruseruseruseruser:x:1000:

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,6 +1,6 @@
 root:*::
 daemon:*::
-bin:*::foo
+bin:*::useruseruseruseruseruseruseruser
 sys:*::
 adm:*::
 tty:*::
@@ -35,8 +35,8 @@
 plugdev:*::
 staff:*::
 games:*::
-users:*::foo
+users:*::
 nogroup:*::
 crontab:x::
 Debian-exim:x::
-foo:*::
+useruseruseruseruseruseruseruser:*::

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -17,4 +17,4 @@
 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:::/bin/false
+useruseruseruseruseruseruseruser:x:1000:1000:::/bin/false

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -17,4 +17,4 @@
 gnats:*:12977:0:99999:7:::
 nobody:*:12977:0:99999:7:::
 Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
+useruseruseruseruseruseruseruser:!:12977:0:99999:7:::

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test	2009-04-14 22:26:30 UTC (rev 2686)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "gpasswd can add an user to a group"
+log_start "$0" "gpasswd can add an user with 32 characters to a group"
 
 save_config
 
@@ -16,8 +16,8 @@
 
 change_config
 
-echo -n "Add user foo to group bin (gpasswd -a foo bin)..."
-gpasswd -a foo bin
+echo -n "Add user useruseruseruseruseruseruseruser to group bin (gpasswd -a useruseruseruseruseruseruseruser bin)..."
+gpasswd -a useruseruseruseruseruseruseruser bin
 echo "OK"
 
 echo -n "Check the passwd file..."

Deleted: debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-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:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:

Modified: debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/groupadd.err
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/groupadd.err	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/groupadd.err	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1 +1 @@
-groupadd: invalid group ID '1002a'
+groupadd: invalid group ID '4294967295'

Deleted: debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-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::

Deleted: debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +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

Deleted: debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +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:::

Modified: debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/groupadd.test	2009-04-14 22:26:30 UTC (rev 2686)
@@ -16,8 +16,8 @@
 
 change_config
 
-echo -n "Add group foo, GID 1002a (groupadd -g 1002a foo)..."
-groupadd -g 1002a foo 2>tmp/groupadd.err && exit 1 || {
+echo -n "Add group foo, GID 4294967295 (groupadd -g 4294967295 foo)..."
+groupadd -g 4294967295 foo 2>tmp/groupadd.err && exit 1 || {
 	status=$?
 }
 echo "OK"
@@ -36,16 +36,16 @@
 rm -f tmp/groupadd.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/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-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:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Modified: debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/groupmod.err
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/groupmod.err	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/groupmod.err	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1 +1 @@
-groupmod: invalid group ID '1001a'
+groupmod: invalid group ID '4294967295'

Deleted: debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-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/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +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

Deleted: debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +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:::

Modified: debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/groupmod.test	2009-04-14 22:26:30 UTC (rev 2686)
@@ -16,8 +16,8 @@
 
 change_config
 
-echo -n "Change GID of bar to 1001a (groupmod -g 1001a bar)..."
-groupmod -g 1001a bar 2>tmp/groupmod.err && exit 1 || {
+echo -n "Change GID of bar to 4294967295 (groupmod -g 4294967295 bar)..."
+groupmod -g 4294967295 bar 2>tmp/groupmod.err && exit 1 || {
 	status=$?
 }
 echo "OK"
@@ -36,16 +36,16 @@
 rm -f tmp/groupmod.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/newusers/47_create_user_error_UID_4294967295/data/group
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-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:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:

Deleted: debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-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::

Modified: debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.err
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/newusers.err	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.err	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,3 +1,3 @@
-newusers: invalid user ID '1foo'
+newusers: invalid user ID '4294967295'
 newusers: line 1: can't create user
 newusers: error detected, changes ignored

Modified: debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.list
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/newusers.list	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.list	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1 +1 @@
-foo:fooPass:1foo::User Foo - Gecos Field::/bin/sh
+foo:fooPass:4294967295::User Foo - Gecos Field::/bin/sh

Deleted: debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/passwd
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +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

Deleted: debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/shadow
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/data/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +0,0 @@
-root::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:::

Modified: debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/newusers.test
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/newusers.test	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/47_create_user_error_UID_4294967295/newusers.test	2009-04-14 22:26:30 UTC (rev 2686)
@@ -36,16 +36,16 @@
 rm -f tmp/newusers.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/newusers/48_create_user_error_GID_4294967295/data/group
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-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:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:

Deleted: debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-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::

Modified: debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.err
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/newusers.err	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.err	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,3 +1,3 @@
-newusers: invalid user ID '1foo'
-newusers: line 1: can't create user
+newusers: invalid group ID '4294967295'
+newusers: line 1: can't create group
 newusers: error detected, changes ignored

Modified: debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.list
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/newusers.list	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.list	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1 +1 @@
-foo:fooPass:1foo::User Foo - Gecos Field::/bin/sh
+foo:fooPass:2147483648:4294967295:User Foo - Gecos Field::/bin/sh

Deleted: debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/passwd
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +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

Deleted: debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/shadow
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/data/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,19 +0,0 @@
-root::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:::

Modified: debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/newusers.test
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/newusers.test	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/48_create_user_error_GID_4294967295/newusers.test	2009-04-14 22:26:30 UTC (rev 2686)
@@ -36,16 +36,16 @@
 rm -f tmp/newusers.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"

Modified: debian/trunk/tests/newusers/49_multiple_system_users/config/etc/group
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/config/etc/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/config/etc/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -40,3 +40,4 @@
 crontab:x:101:
 Debian-exim:x:102:
 foo:x:65535:foo
+fooo:x:997:

Modified: debian/trunk/tests/newusers/49_multiple_system_users/config/etc/gshadow
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/config/etc/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/config/etc/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -39,3 +39,5 @@
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:x::
+fooo:x::

Modified: debian/trunk/tests/newusers/49_multiple_system_users/config/etc/passwd
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/config/etc/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/config/etc/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -18,3 +18,4 @@
 nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
 Debian-exim:x:102:102::/var/spool/exim4:/bin/false
 foo:x:65535:65535:User Foo - Gecos Field::/bin/sh
+fooo:x:997:997:User Foo - Gecos Field::/bin/sh

Modified: debian/trunk/tests/newusers/49_multiple_system_users/config/etc/shadow
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/config/etc/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/config/etc/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -18,3 +18,4 @@
 nobody:*:12977:0:99999:7:::
 Debian-exim:!:12977:0:99999:7:::
 foo:eKzSSVkXDoVUM:13906:0:99999:7:::
+fooo:eKzSSVkXDoVUM:13906:0:99999:7:::

Modified: debian/trunk/tests/newusers/49_multiple_system_users/data/group
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/data/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/data/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -40,19 +40,20 @@
 crontab:x:101:
 Debian-exim:x:102:
 foo:x:65535:foo
-foo1:x:1000:
-foo1a:x:1001:
+fooo:x:997:
+foo1:x:99:
+foo1a:x:98:
 foo2:x:2000:
-foo3:x:2001:
-foo4:x:3000:
+foo3:x:97:
+foo4:x:96:
 foo5:x:3005:
-foo6:x:3002:
+foo6:x:95:
 foo7:x:61000:
-foo8:x:3003:
-foo9:x:3006:
-foo10:x:3004:
+foo8:x:94:
+foo9:x:93:
+foo10:x:92:
 foo11:x:63000:
-foo12:x:3007:
-foo13:x:3008:
-foo14:x:59000:
-foo15:x:59001:
+foo12:x:91:
+foo13:x:90:
+foo14:x:89:
+foo15:x:88:

Modified: debian/trunk/tests/newusers/49_multiple_system_users/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/data/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/data/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -39,6 +39,8 @@
 nogroup:*::
 crontab:x::
 Debian-exim:x::
+foo:x::
+fooo:x::
 foo1:*::
 foo1a:*::
 foo2:*::

Modified: debian/trunk/tests/newusers/49_multiple_system_users/data/passwd
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/data/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/data/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -18,20 +18,21 @@
 nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
 Debian-exim:x:102:102::/var/spool/exim4:/bin/false
 foo:x:65535:65535:User Foo - Gecos Field::/bin/sh
-foo1:x:1000:1000:User Foo - Gecos Field::/bin/sh
-foo1a:x:1000:1001:User Foo - Gecos Field::/bin/sh
-foo1b:x:1001:1001:User Foo - Gecos Field::/bin/sh
+fooo:x:997:997:User Foo - Gecos Field::/bin/sh
+foo1:x:999:99:User Foo - Gecos Field::/bin/sh
+foo1a:x:999:98:User Foo - Gecos Field::/bin/sh
+foo1b:x:998:98:User Foo - Gecos Field::/bin/sh
 foo2:x:2000:2000:User Foo - Gecos Field::/bin/sh
-foo3:x:2001:2001:User Foo - Gecos Field::/bin/sh
-foo4:x:3000:3000:User Foo - Gecos Field::/bin/sh
-foo5:x:3001:3005:User Foo - Gecos Field::/bin/sh
-foo6:x:3002:3002:User Foo - Gecos Field::/bin/sh
+foo3:x:996:97:User Foo - Gecos Field::/bin/sh
+foo4:x:3000:96:User Foo - Gecos Field::/bin/sh
+foo5:x:995:3005:User Foo - Gecos Field::/bin/sh
+foo6:x:994:95:User Foo - Gecos Field::/bin/sh
 foo7:x:61000:61000:User Foo - Gecos Field::/bin/sh
-foo8:x:3003:3003:User Foo - Gecos Field::/bin/sh
-foo9:x:62000:3006:User Foo - Gecos Field::/bin/sh
-foo10:x:3004:3004:User Foo - Gecos Field::/bin/sh
-foo11:x:3005:63000:User Foo - Gecos Field::/bin/sh
-foo12:x:3006:3007:User Foo - Gecos Field::/bin/sh
-foo13:x:3007:3008:User Foo - Gecos Field::/bin/sh
-foo14:x:59000:59000:User Foo - Gecos Field::/bin/sh
-foo15:x:59001:59001:User Foo - Gecos Field::/bin/sh
+foo8:x:993:94:User Foo - Gecos Field::/bin/sh
+foo9:x:62000:93:User Foo - Gecos Field::/bin/sh
+foo10:x:992:92:User Foo - Gecos Field::/bin/sh
+foo11:x:991:63000:User Foo - Gecos Field::/bin/sh
+foo12:x:990:91:User Foo - Gecos Field::/bin/sh
+foo13:x:989:90:User Foo - Gecos Field::/bin/sh
+foo14:x:59000:89:User Foo - Gecos Field::/bin/sh
+foo15:x:988:88:User Foo - Gecos Field::/bin/sh

Modified: debian/trunk/tests/newusers/49_multiple_system_users/data/shadow
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/data/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/data/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -18,6 +18,7 @@
 nobody:*:12977:0:99999:7:::
 Debian-exim:!:12977:0:99999:7:::
 foo:eKzSSVkXDoVUM:13906:0:99999:7:::
+fooo:eKzSSVkXDoVUM:13906:0:99999:7:::
 foo1:@PASS_DES foo1Pass@:@TODAY@:0:99999:7:::
 foo1a:@PASS_DES foo1aPas@:@TODAY@:0:99999:7:::
 foo1b:@PASS_DES foo1bPas@:@TODAY@:0:99999:7:::

Modified: debian/trunk/tests/newusers/49_multiple_system_users/newusers.test
===================================================================
--- debian/trunk/tests/newusers/20_multiple_users/newusers.test	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/newusers/49_multiple_system_users/newusers.test	2009-04-14 22:26:30 UTC (rev 2686)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "newusers can add multiple users"
+log_start "$0" "newusers can add multiple system users"
 
 save_config
 
@@ -16,8 +16,7 @@
 
 change_config
 
-newusers data/newusers.list
-cp /etc/shadow /tmp
+newusers --system data/newusers.list
 
 echo -n "Check the passwd file..." 
 ../../common/compare_file.pl data/passwd /etc/passwd 

Deleted: debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/group
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/group	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/group	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,43 +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:
-foo2:x:1001:

Deleted: debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/gshadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/gshadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,43 +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:*::
-foo2:*::

Deleted: debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/home_ls-a	2009-04-14 22:26:30 UTC (rev 2686)
@@ -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/54_usermod-u_invalid_UID_4294967295/data/passwd
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/passwd	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/passwd	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,21 +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
-foo2:x:1001:1001::/home/foo2:/bin/false

Deleted: debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/shadow
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/shadow	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/shadow	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1,21 +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:::
-foo2:!:12977:0:99999:7:::

Modified: debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/usermod.err	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/usermod.err	2009-04-14 22:26:30 UTC (rev 2686)
@@ -1 +1 @@
-usermod: invalid user ID '100a1'
+usermod: invalid user ID '4294967295'

Modified: debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/usermod.test
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/usermod.test	2009-04-12 02:53:21 UTC (rev 2677)
+++ debian/trunk/tests/usertools/54_usermod-u_invalid_UID_4294967295/usermod.test	2009-04-14 22:26:30 UTC (rev 2686)
@@ -16,8 +16,8 @@
 
 change_config
 
-echo -n "Change the user's UID (usermod -u 100a1 foo)..."
-usermod -u 100a1 foo 2>tmp/usermod.err && exit 1 || {
+echo -n "Change the user's UID (usermod -u 4294967295 foo)..."
+usermod -u 4294967295 foo 2>tmp/usermod.err && exit 1 || {
 	status=$?
 }
 echo "OK"
@@ -36,16 +36,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"


