Sun Mar 9 00:18:08 UTC 2008

Author: nekral-guest
Date: 2008-03-09 00:18:07 +0000 (Sun, 09 Mar 2008)
New Revision: 1897

Added:
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config.txt
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/group
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config.txt
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/group
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config.txt
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config.txt
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/config.txt
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/group
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/passwd
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/shadow
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/passwd
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/shadow
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config.txt
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/group
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config.txt
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
Modified:
   debian/trunk/tests/run_all
Log:
Added tests for pwconv and pwunconv.


Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/group
===================================================================

--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config.txt
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,5 @@
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+group foo with a password, not in gshadow

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1 @@
+pwconv: can't lock passwd file

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwconv tests if the passwd file is locked"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock' 0
+
+change_config
+
+echo -n "Create lock file for /etc/passwd..."
+touch /etc/passwd.lock
+echo "done"
+
+echo -n "Convert the passwd files (pwconv)..."
+pwconv 2>tmp/pwconv.err && exit || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Delete lock file for /etc/passwd..."
+rm -f /etc/passwd.lock
+echo "done"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "5"
+echo "OK"
+
+echo "pwconv reported:"
+echo "======================================================================="
+cat tmp/pwconv.err
+echo "======================================================================="
+echo -n "Check that there were a failure message..."
+diff -au data/pwconv.err tmp/pwconv.err
+echo "error message OK."
+rm -f tmp/pwconv.err
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl data/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
___________________________________________________________________
Name: svn:executable
   + *

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config.txt
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,5 @@
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+group foo with a password, not in gshadow

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1 @@
+pwconv: can't lock shadow file

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwconv tests if the shadow file is locked"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/shadow.lock' 0
+
+change_config
+
+echo -n "Create lock file for /etc/shadow..."
+touch /etc/shadow.lock
+echo "done"
+
+echo -n "Convert the shadow files (pwconv)..."
+pwconv 2>tmp/pwconv.err && exit || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Delete lock file for /etc/shadow..."
+rm -f /etc/shadow.lock
+echo "done"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "5"
+echo "OK"
+
+echo "pwconv reported:"
+echo "======================================================================="
+cat tmp/pwconv.err
+echo "======================================================================="
+echo -n "Check that there were a failure message..."
+diff -au data/pwconv.err tmp/pwconv.err
+echo "error message OK."
+rm -f tmp/pwconv.err
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl data/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
___________________________________________________________________
Name: svn:executable
   + *

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config.txt
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,5 @@
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+group foo with a password, not in gshadow

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1 @@
+pwunconv: can't lock passwd file

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwunconv tests if the passwd file is locked"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock' 0
+
+change_config
+
+echo -n "Create lock file for /etc/passwd..."
+touch /etc/passwd.lock
+echo "done"
+
+echo -n "Convert the passwd files (pwunconv)..."
+pwunconv 2>tmp/pwunconv.err && exit || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Delete lock file for /etc/passwd..."
+rm -f /etc/passwd.lock
+echo "done"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "5"
+echo "OK"
+
+echo "pwunconv reported:"
+echo "======================================================================="
+cat tmp/pwunconv.err
+echo "======================================================================="
+echo -n "Check that there were a failure message..."
+diff -au data/pwunconv.err tmp/pwunconv.err
+echo "error message OK."
+rm -f tmp/pwunconv.err
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl data/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
___________________________________________________________________
Name: svn:executable
   + *

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config.txt
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,5 @@
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+group foo with a password, not in gshadow

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1 @@
+pwunconv: can't lock shadow file

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwunconv tests if the shadow file is locked"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/shadow.lock' 0
+
+change_config
+
+echo -n "Create lock file for /etc/shadow..."
+touch /etc/shadow.lock
+echo "done"
+
+echo -n "Convert the shadow files (pwunconv)..."
+pwunconv 2>tmp/pwunconv.err && exit || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Delete lock file for /etc/shadow..."
+rm -f /etc/shadow.lock
+echo "done"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "5"
+echo "OK"
+
+echo "pwunconv reported:"
+echo "======================================================================="
+cat tmp/pwunconv.err
+echo "======================================================================="
+echo -n "Check that there were a failure message..."
+diff -au data/pwunconv.err tmp/pwunconv.err
+echo "error message OK."
+rm -f tmp/pwunconv.err
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl data/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
___________________________________________________________________
Name: svn:executable
   + *

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x:1000:

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,43 @@
+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:*::
+bar:*::

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,21 @@
+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:::
+bar:!:12977:0:99999:7:::

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,2 @@
+user foo, in group users
+group bar is gshadow, not group

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x:1000:

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,43 @@
+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:*::
+bar:*::

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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:::

Added: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwconv removes the shadow only entries"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Convert the passwd files (pwconv)..."
+pwconv
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl data/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
___________________________________________________________________
Name: svn:executable
   + *

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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:$1$foogroupPassword:1000:1000:::/bin/false

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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:::

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/config.txt
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1 @@
+user foo with a password, not in shadow

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/passwd
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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:::/bin/false

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/shadow
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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:$1$foogroupPassword:@TODAY@:0:99999:7:::

Added: debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwconv removes the shadow only entries"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Convert the passwd files (pwconv)..."
+pwconv
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl data/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test
___________________________________________________________________
Name: svn:executable
   + *

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x:1000:

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,43 @@
+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:*::
+bar:*::

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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:::

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config.txt
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,6 @@
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+user foo, in group users
+group bar is gshadow, not group

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x:1000:

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,43 @@
+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:*::
+bar:*::

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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

Added: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwunconv exits successfully when the shadow file does not exist"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Remove the shadow file..."
+rm -f /etc/shadow
+echo "done"
+
+echo -n "Convert the passwd files (pwunconv)..."
+pwunconv
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+test ! -f /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
___________________________________________________________________
Name: svn:executable
   + *

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+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:::/bin/false

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,19 @@
+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:::

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config.txt
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/config.txt	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1 @@
+user foo with a password, not in shadow

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,42 @@
+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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:0:0:root:/root:/bin/bash
+daemon:*:1:1:daemon:/usr/sbin:/bin/sh
+bin:*:2:2:bin:/bin:/bin/sh
+sys:*:3:3:sys:/dev:/bin/sh
+sync:*:4:65534:sync:/bin:/bin/sync
+games:*:5:60:games:/usr/games:/bin/sh
+man:*:6:12:man:/var/cache/man:/bin/sh
+lp:*:7:7:lp:/var/spool/lpd:/bin/sh
+mail:*:8:8:mail:/var/mail:/bin/sh
+news:*:9:9:news:/var/spool/news:/bin/sh
+uucp:*:10:10:uucp:/var/spool/uucp:/bin/sh
+proxy:*:13:13:proxy:/bin:/bin/sh
+www-data:*:33:33:www-data:/var/www:/bin/sh
+backup:*:34:34:backup:/var/backups:/bin/sh
+list:*:38:38:Mailing List Manager:/var/list:/bin/sh
+irc:*:39:39:ircd:/var/run/ircd:/bin/sh
+gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
+nobody:*:65534:65534:nobody:/nonexistent:/bin/sh
+Debian-exim:!:102:102::/var/spool/exim4:/bin/false
+foo:x:1000:1000:::/bin/false

Added: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test	2008-03-09 00:18:07 UTC (rev 1897)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwunconv does not fail when a user is not in the shadow file"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Unconvert the shadow file (pwunconv)..."
+pwunconv
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+test ! -f /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl data/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
___________________________________________________________________
Name: svn:executable
   + *

Modified: debian/trunk/tests/run_all
===================================================================
--- debian/trunk/tests/run_all	2008-03-09 00:14:34 UTC (rev 1896)
+++ debian/trunk/tests/run_all	2008-03-09 00:18:07 UTC (rev 1897)
@@ -103,6 +103,14 @@
 run_test ./convtools/08_grpunconv_no_gshadow_file/grpunconv.test
 run_test ./convtools/09_grpunconv_error_group_locked/grpunconv.test
 run_test ./convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
+run_test ./convtools/11_pwconv_error_passwd_locked/pwconv.test
+run_test ./convtools/12_pwconv_error_shadow_locked/pwconv.test
+run_test ./convtools/14_pwunconv_error_shadow_locked/pwunconv.test
+run_test ./convtools/13_pwunconv_error_passwd_locked/pwunconv.test
+run_test ./convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
+run_test ./convtools/16_pwconv_copy_passwd/pwconv.test
+run_test ./convtools/17_pwunconv_no_shadow_file/pwunconv.test
+run_test ./convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
 run_test ./chage/01/run
 run_test ./chage/02/run
 run_test ./chsh/01/run


