[Pkg-shadow-commits] r2638 - in debian/trunk/tests: . newusers newusers/45_create_user_encrypt_rounds_3000/data newusers/46_create_user_encrypt_MD5_ignore_rounds_3000 newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sat Apr 11 11:55:40 UTC 2009
Author: nekral-guest
Date: 2009-04-11 11:55:40 +0000 (Sat, 11 Apr 2009)
New Revision: 2638
Added:
debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err
debian/trunk/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/
Removed:
debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/group
debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/gshadow
debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/passwd
debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/shadow
Modified:
debian/trunk/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow
debian/trunk/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
debian/trunk/tests/run_all
Log:
Added tests for newusers.
Deleted: debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/group
===================================================================
--- debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/group 2009-04-11 11:36:33 UTC (rev 2637)
+++ debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/group 2009-04-11 11:55:40 UTC (rev 2638)
@@ -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:
Deleted: debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/gshadow 2009-04-11 11:36:33 UTC (rev 2637)
+++ debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/gshadow 2009-04-11 11:55:40 UTC (rev 2638)
@@ -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:*::
Added: debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err
===================================================================
--- debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err (rev 0)
+++ debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err 2009-04-11 11:55:40 UTC (rev 2638)
@@ -0,0 +1,8 @@
+newusers: -s flag is only allowed with the -c flag
+Usage: newusers [options] [input]
+
+ -c, --crypt-method the crypt method (one of NONE DES MD5 SHA256 SHA512)
+ -r, --system create system accounts
+ -s, --sha-rounds number of SHA rounds for the SHA*
+ crypt algorithms
+
Deleted: debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/passwd
===================================================================
--- debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/passwd 2009-04-11 11:36:33 UTC (rev 2637)
+++ debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/passwd 2009-04-11 11:55:40 UTC (rev 2638)
@@ -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:User Foo - Gecos Field::/bin/sh
Deleted: debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/shadow
===================================================================
--- debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/shadow 2009-04-11 11:36:33 UTC (rev 2637)
+++ debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/data/shadow 2009-04-11 11:55:40 UTC (rev 2638)
@@ -1,20 +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:::
-foo:@PASS_SHA256 fooPass@:@TODAY@:0:99999:7:::
Modified: debian/trunk/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow
===================================================================
--- debian/trunk/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/shadow 2009-04-11 11:25:12 UTC (rev 2636)
+++ debian/trunk/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow 2009-04-11 11:55:40 UTC (rev 2638)
@@ -17,4 +17,4 @@
gnats:*:12977:0:99999:7:::
nobody:*:12977:0:99999:7:::
Debian-exim:!:12977:0:99999:7:::
-foo:@PASS_SHA256 fooPass@:@TODAY@:0:99999:7:::
+foo:@PASS_MD5 fooPass@:@TODAY@:0:99999:7:::
Modified: debian/trunk/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
===================================================================
--- debian/trunk/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test 2009-04-11 11:25:12 UTC (rev 2636)
+++ debian/trunk/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test 2009-04-11 11:55:40 UTC (rev 2638)
@@ -7,7 +7,7 @@
. ../../common/config.sh
. ../../common/log.sh
-log_start "$0" "newusers can encrypt the passwords with the SHA256 algorithm and a specified number of rounds"
+log_start "$0" "newusers ignore the number of rounds with the MD5 method"
save_config
@@ -16,8 +16,8 @@
change_config
-echo "newusers -c SHA256 -s 3000 data/newusers.list"
-newusers -c SHA256 -s 3000 data/newusers.list
+echo "newusers -c MD5 -s 3000 data/newusers.list"
+newusers -c MD5 -s 3000 data/newusers.list
echo -n "Check the passwd file..."
../../common/compare_file.pl data/passwd /etc/passwd
@@ -28,15 +28,6 @@
echo -n "Check the shadow file..."
../../common/compare_file.pl data/shadow /etc/shadow
echo "OK"
-echo -n "Check the number of rounds..."
-rounds=$(sed -n 's/^foo:\$5\$rounds=\([0-9]*\)\$.*$/\1/p' /etc/shadow)
-echo -n "($rounds)..."
-if [ ! "$rounds" = 3000 ]; then
- echo "Wrong number of rounds"
- grep "^foo:" /etc/shadow
- exit 1
-fi
-echo "OK"
echo -n "Check the gshadow file..."
../../common/compare_file.pl data/gshadow /etc/gshadow
echo "OK"
Modified: debian/trunk/tests/run_all
===================================================================
--- debian/trunk/tests/run_all 2009-04-11 11:36:33 UTC (rev 2637)
+++ debian/trunk/tests/run_all 2009-04-11 11:55:40 UTC (rev 2638)
@@ -507,6 +507,7 @@
run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test
run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test
run_test ./newusers/45_create_user_encrypt_rounds_3000/newusers.test
+run_test ./newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
run_test ./split_groups/01_useradd_split_group/useradd.test
run_test ./split_groups/02_useradd_no_split_group/useradd.test
run_test ./split_groups/03_useradd_split_group_already_split/useradd.test
More information about the Pkg-shadow-commits
mailing list