Sat May 9 22:39:12 UTC 2009

Author: nekral-guest
Date: 2009-05-09 22:39:12 +0000 (Sat, 09 May 2009)
New Revision: 2891

Added:
   debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd/
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/
   debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/
   debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/
   debian/trunk/tests/crypt/login.defs_none/02_chgpasswd.test
   debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/
Removed:
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/group
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/passwd
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/group
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/passwd
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/shadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/shadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/shadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/shadow
   debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/shadow
   debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/group
   debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/passwd
   debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/shadow
   debian/trunk/tests/crypt/login.defs_none/01_chpasswd/group
   debian/trunk/tests/crypt/login.defs_none/01_chpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_none/01_chpasswd/passwd
   debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/group
   debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/passwd
   debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/shadow
Modified:
   debian/trunk/tests/crypt/login.defs_MD5/
   debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd/shadow
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test
   debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA256/
   debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_SHA512/
   debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd.test
   debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow
   debian/trunk/tests/crypt/login.defs_none/
   debian/trunk/tests/crypt/login.defs_none/01_chpasswd.test
   debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/gshadow
Log:
Since chpasswd is now PAM enabled, the crypt tests are passed with chgpasswd.
Do not copy the database which should not change. Directly compare the system files with the files from config/.
Update some test descriptions.



Property changes on: debian/trunk/tests/crypt/login.defs_MD5
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Modified: debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow
===================================================================

--- debian/trunk/tests/crypt/login.defs_MD5/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_MD5 test@::
 crontab:x::
 Debian-exim:x::

Modified: debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -15,5 +15,5 @@
 list:*:12977:0:99999:7:::
 irc:*:12977:0:99999:7:::
 gnats:*:12977:0:99999:7:::
-nobody:@PASS_MD5 test@:@TODAY@:0:99999:7:::
+nobody:*:12977:0:99999:7:::
 Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_MD5/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_MD5/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Change a group password"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "echo nogroup:test | chgpasswd..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl 02_chgpasswd/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl 02_chgpasswd/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl 02_chgpasswd/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Deleted: debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/group	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/passwd	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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

Modified: debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -21,16 +21,16 @@
 echo "OK"
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
 ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/group	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_MD5 test@::
 crontab:x::
 Debian-exim:x::

Deleted: debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/passwd	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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:@PASS_MD5 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Change a group password"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "echo nogroup:test | chgpasswd..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/crypt/login.defs_SHA256
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Deleted: debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/group	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256/01_chpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/gshadow	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256/01_chpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/passwd	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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

Modified: debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd.test
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd.test	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -21,16 +21,16 @@
 echo "OK"
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
 ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/group	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256/02_chgpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_SHA256 test@::
 crontab:x::
 Debian-exim:x::

Deleted: debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/passwd	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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:@PASS_SHA256 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_SHA256/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_SHA256/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Change a group password"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "echo nogroup:test | chgpasswd..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/crypt/login.defs_SHA256-round-max
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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

Modified: debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -21,10 +21,10 @@
 echo "OK"
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
 ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
@@ -36,7 +36,7 @@
 }
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/group	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_SHA256 test@::
 crontab:x::
 Debian-exim:x::

Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/passwd	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-max/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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:@PASS_SHA256 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Add a new user"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "echo nogroup:test | chgpasswd..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+echo -n "Check the number of rounds..."
+grep -q '^nogroup:\$5\$rounds=7000\$' /etc/gshadow || {
+	grep "^nogroup:" /etc/gshadow
+	exit 1
+}
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/crypt/login.defs_SHA256-round-min
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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

Modified: debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -21,10 +21,10 @@
 echo "OK"
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
 ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
@@ -36,7 +36,7 @@
 }
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/group	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_SHA256 test@::
 crontab:x::
 Debian-exim:x::

Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/passwd	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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:@PASS_SHA256 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Changea group password"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "echo nogroup:test | chgpasswd..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+echo -n "Check the number of rounds..."
+grep -q '^nogroup:\$5\$rounds=2000\$' /etc/gshadow || {
+	grep "^nogroup:" /etc/gshadow
+	exit 1
+}
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/crypt/login.defs_SHA256-round-min-max
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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

Modified: debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -21,10 +21,10 @@
 echo "OK"
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
 ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
@@ -39,7 +39,7 @@
 fi
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 echo ""

Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/group	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_SHA256 test@::
 crontab:x::
 Debian-exim:x::

Deleted: debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/passwd	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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:@PASS_SHA256 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Change a group's password with chgpasswd"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Change group nogroup's password (echo nogroup:test | chgpasswd)..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+echo -n "Check the number of rounds..."
+rounds1=$(sed -n 's/^nogroup:\$5\$rounds=\([0-9]*\)\$.*$/\1/p' /etc/gshadow)
+echo -n "($rounds1)..."
+if [ "$rounds1" -lt 3000 ] || [ "$rounds1" -gt 10000 ]; then
+	echo "Wrong rounds: $rounds1"
+	grep "^nogroup:" /etc/gshadow
+	exit 1
+fi
+echo "OK"
+
+echo ""
+echo "Make sure the number of rounds is not constant"
+
+echo -n "  Change group nogroup's password (echo nogroup:test | chgpasswd)..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+rounds2=$(sed -n 's/^nogroup:\$5\$rounds=\([0-9]*\)\$.*$/\1/p' /etc/gshadow)
+if [ "$rounds1" = "$rounds2" ]; then
+	echo "The number of rounds did not change."
+	echo "It may not be a error, please re-run this test."
+	exit 1
+fi
+echo -n "($rounds2)..."
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/crypt/login.defs_SHA512
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Deleted: debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/group	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA512/01_chpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/gshadow	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA512/01_chpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/passwd	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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

Modified: debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd.test
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd.test	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -21,16 +21,16 @@
 echo "OK"
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
 ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/group	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA512/02_chgpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_SHA512 test@::
 crontab:x::
 Debian-exim:x::

Deleted: debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/passwd	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_SHA512/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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:@PASS_SHA512 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_SHA512/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_SHA512/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Change a group's password with chgpasswd"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "echo nogroup:test | chgpasswd..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/crypt/login.defs_none
___________________________________________________________________
Modified: svn:ignore
   - 01_chpasswd.test.log

   + 01_chpasswd.test.log
02_chgpasswd.test.log


Deleted: debian/trunk/tests/crypt/login.defs_none/01_chpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd/group	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_none/01_chpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_none/01_chpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd/gshadow	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_none/01_chpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_none/01_chpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd/passwd	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_none/01_chpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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

Modified: debian/trunk/tests/crypt/login.defs_none/01_chpasswd.test
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd.test	2009-05-09 22:32:10 UTC (rev 2890)
+++ debian/trunk/tests/crypt/login.defs_none/01_chpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -21,16 +21,16 @@
 echo "OK"
 
 echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
+../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"
 echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
+../../common/compare_file.pl config/etc/group /etc/group
 echo "OK"
 echo -n "Check the shadow file..."
 ../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"

Deleted: debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/group
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd/group	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/group	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_none/02_chgpasswd/gshadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd/gshadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/gshadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -36,6 +36,6 @@
 staff:*::
 games:*::
 users:*::
-nogroup:*::
+nogroup:@PASS_DES test@::
 crontab:x::
 Debian-exim:x::

Deleted: debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/passwd
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd/passwd	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/passwd	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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/crypt/login.defs_none/02_chgpasswd/shadow
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/01_chpasswd/shadow	2009-04-30 21:53:54 UTC (rev 2853)
+++ debian/trunk/tests/crypt/login.defs_none/02_chgpasswd/shadow	2009-05-09 22:39:12 UTC (rev 2891)
@@ -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:@PASS_DES test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Copied: debian/trunk/tests/crypt/login.defs_none/02_chgpasswd.test (from rev 2853, debian/trunk/tests/crypt/login.defs_none/01_chpasswd.test)
===================================================================
--- debian/trunk/tests/crypt/login.defs_none/02_chgpasswd.test	                        (rev 0)
+++ debian/trunk/tests/crypt/login.defs_none/02_chgpasswd.test	2009-05-09 22:39:12 UTC (rev 2891)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "Change a group's password with chgpasswd"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "echo nogroup:test | chgpasswd..."
+echo nogroup:test | chgpasswd
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


