Merge sync of head

10 files changed, 445 insertions, 75 deletions

diff --git a/pw/tests/Makefile b/pw/tests/Makefile
index 6bc9433..37d9c71 100644
--- a/pw/tests/Makefile
+++ b/pw/tests/Makefile
@@ -5,10 +5,18 @@ TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/useradd
 
 TESTSDIR=	${TESTSBASE}/usr.sbin/pw
 
-ATF_TESTS_SH=	pw_delete pw_lock pw_modify pw_etcdir
+ATF_TESTS_SH=	pw_etcdir \
+		pw_lock \
+		pw_groupdel \
+		pw_groupmod \
+		pw_useradd \
+		pw_userdel \
+		pw_usermod \
+		pw_usernext
 
-TEST_METADATA.pw_delete+=	required_user="root"
-TEST_METADATA.pw_modify+=	required_user="root"
+.for tp in ${ATF_TESTS_SH}
+TEST_METADATA.${tp}+=	required_user="root"
+.endfor
 
 FILES=		group helper_functions.shin master.passwd
 FILESDIR=       ${TESTSDIR}
diff --git a/pw/tests/helper_functions.shin b/pw/tests/helper_functions.shin
index f87b1e7..3680dfe 100755
--- a/pw/tests/helper_functions.shin
+++ b/pw/tests/helper_functions.shin
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+# The pw command
+PW="pw -V ${HOME}"
+
 # Workdir to run tests in
 TESTDIR=$(atf_get_srcdir)
 
diff --git a/pw/tests/pw_delete.sh b/pw/tests/pw_delete.sh
deleted file mode 100755
index 02a9ade..0000000
--- a/pw/tests/pw_delete.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-# $FreeBSD$
-
-# Import helper functions
-. $(atf_get_srcdir)/helper_functions.shin
-
-# Test that a user can be deleted when another user is part of this
-# user's default group and does not go into an infinate loop.
-# PR: 191427
-atf_test_case rmuser_seperate_group cleanup
-rmuser_seperate_group_head() {
-	atf_set "timeout" "30"
-}
-rmuser_seperate_group_body() {
-	populate_etc_skel
-	pw -V ${HOME} useradd test || atf_fail "Creating test user"
-	pw -V ${HOME} groupmod test -M 'test,root' || \
-		atf_fail "Modifying the group"
-	pw -V ${HOME} userdel test || atf_fail "Delete the test user"
-}
-
-atf_test_case group_do_not_delete_wheel_if_group_unknown
-group_do_not_delete_wheel_if_group_unknown_head() {
-	atf_set "descr" "Make sure we do not consider gid 0 an unknown group"
-}
-
-group_do_not_delete_wheel_if_group_unknown_body() {
-	populate_etc_skel
-	atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel
-	atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x pw -V ${HOME} groupdel -g I_do_not_exist
-	atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel
-}
-
-atf_test_case user_do_not_try_to_delete_root_if_user_unknown
-user_do_not_try_to_delete_root_if_user_unknown_head() {
-	atf_set "descr" "Make sure not to try to remove root if deleting an unknown user"
-}
-
-user_do_not_try_to_delete_root_if_user_unknown_body() {
-	populate_etc_skel
-	atf_check -e inline:"pw: -u expects a number\n" -s exit:64 -x pw -V ${HOME} userdel -u plop
-}
-
-atf_init_test_cases() {
-	atf_add_test_case rmuser_seperate_group
-	atf_add_test_case group_do_not_delete_wheel_if_group_unknown
-	atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown
-}
diff --git a/pw/tests/pw_groupdel.sh b/pw/tests/pw_groupdel.sh
new file mode 100755
index 0000000..75b063a
--- /dev/null
+++ b/pw/tests/pw_groupdel.sh
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+
+# Test to make sure we do not accidentially delete wheel when trying to delete
+# an unknown group
+atf_test_case group_do_not_delete_wheel_if_group_unknown
+group_do_not_delete_wheel_if_group_unknown_head() {
+        atf_set "descr" "Make sure we do not consider gid 0 an unknown group"
+}
+group_do_not_delete_wheel_if_group_unknown_body() {
+        populate_etc_skel
+        atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x ${PW} groupshow wheel
+        atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x \
+		${PW} groupdel -g I_do_not_exist
+        atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x ${PW} groupshow wheel
+}
+
+
+atf_init_test_cases() {
+        atf_add_test_case group_do_not_delete_wheel_if_group_unknown
+}
diff --git a/pw/tests/pw_modify.sh b/pw/tests/pw_groupmod.sh
index b81f105..ad7ad0a 100755
--- a/pw/tests/pw_modify.sh
+++ b/pw/tests/pw_groupmod.sh
@@ -8,11 +8,11 @@
 atf_test_case groupmod_user
 groupmod_user_body() {
 	populate_etc_skel
-	atf_check -s exit:0 pw -V ${HOME} addgroup test
-	atf_check -s exit:0 pw -V ${HOME} groupmod test -m root
+	atf_check -s exit:0 ${PW} addgroup test
+	atf_check -s exit:0 ${PW} groupmod test -m root
 	atf_check -s exit:0 -o match:"^test:\*:1001:root$" \
 		grep "^test:\*:.*:root$" $HOME/group
-	atf_check -s exit:0 pw -V ${HOME} groupmod test -d root
+	atf_check -s exit:0 ${PW} groupmod test -d root
 	atf_check -s exit:0 -o match:"^test:\*:1001:$" \
 		grep "^test:\*:.*:$" $HOME/group
 }
@@ -22,9 +22,9 @@ groupmod_user_body() {
 atf_test_case groupmod_invalid_user
 groupmod_invalid_user_body() {
 	populate_etc_skel
-	atf_check -s exit:0 pw -V ${HOME} addgroup test
-	atf_check -s exit:67 -e match:"does not exist" pw -V ${HOME} groupmod test -m foo
-	atf_check -s exit:0  pw -V ${HOME} groupmod test -d foo
+	atf_check -s exit:0 ${PW} addgroup test
+	atf_check -s exit:67 -e match:"does not exist" ${PW} groupmod test -m foo
+	atf_check -s exit:0  ${PW} groupmod test -d foo
 }
 
 atf_test_case groupmod_bug_193704
@@ -33,9 +33,9 @@ groupmod_bug_193704_head() {
 }
 groupmod_bug_193704_body() {
 	populate_etc_skel
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd test
-	atf_check -s exit:0 -x pw -V ${HOME} groupmod test -l newgroupname
-	atf_check -s exit:65 -e match:"^pw: unknown group" -x pw -V ${HOME} groupshow test
+	atf_check -s exit:0 -x ${PW} groupadd test
+	atf_check -s exit:0 -x ${PW} groupmod test -l newgroupname
+	atf_check -s exit:65 -e match:"^pw: unknown group" -x ${PW} groupshow test
 }
 
 atf_test_case usermod_bug_185666
@@ -45,17 +45,17 @@ usermod_bug_185666_head() {
 
 usermod_bug_185666_body() {
 	populate_etc_skel
-	atf_check -s exit:0 -x pw -V ${HOME} useradd testuser
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup2
-	atf_check -s exit:0 -x pw -V ${HOME} usermod testuser -G testgroup
-	atf_check -o inline:"testuser:*:1001:\n" -x pw -V${HOME} groupshow testuser
-	atf_check -o inline:"testgroup:*:1002:testuser\n" -x pw -V ${HOME} groupshow testgroup
-	atf_check -o inline:"testgroup2:*:1003:\n" -x pw -V${HOME} groupshow testgroup2
-	atf_check -s exit:0 -x pw -V ${HOME} usermod testuser -G testgroup2
-	atf_check -o inline:"testuser:*:1001:\n" -x pw -V ${HOME} groupshow testuser
-	atf_check -o inline:"testgroup:*:1002:\n" -x pw -V ${HOME} groupshow testgroup
-	atf_check -o inline:"testgroup2:*:1003:testuser\n" -x pw -V ${HOME} groupshow testgroup2
+	atf_check -s exit:0 -x ${PW} useradd testuser
+	atf_check -s exit:0 -x ${PW} groupadd testgroup
+	atf_check -s exit:0 -x ${PW} groupadd testgroup2
+	atf_check -s exit:0 -x ${PW} usermod testuser -G testgroup
+	atf_check -o inline:"testuser:*:1001:\n" -x ${PW} groupshow testuser
+	atf_check -o inline:"testgroup:*:1002:testuser\n" -x ${PW} groupshow testgroup
+	atf_check -o inline:"testgroup2:*:1003:\n" -x ${PW} groupshow testgroup2
+	atf_check -s exit:0 -x ${PW} usermod testuser -G testgroup2
+	atf_check -o inline:"testuser:*:1001:\n" -x ${PW} groupshow testuser
+	atf_check -o inline:"testgroup:*:1002:\n" -x ${PW} groupshow testgroup
+	atf_check -o inline:"testgroup2:*:1003:testuser\n" -x ${PW} groupshow testgroup2
 }
 
 atf_test_case do_not_duplicate_group_on_gid_change
@@ -65,8 +65,8 @@ do_not_duplicate_group_on_gid_change_head() {
 
 do_not_duplicate_group_on_gid_change_body() {
 	populate_etc_skel
-	atf_check -s exit:0 -x pw -V ${HOME} groupadd testgroup
-	atf_check -s exit:0 -x pw -V ${HOME} groupmod testgroup -g 12345
+	atf_check -s exit:0 -x ${PW} groupadd testgroup
+	atf_check -s exit:0 -x ${PW} groupmod testgroup -g 12345
 	# use grep to see if the entry has not be duplicated
 	atf_check -o inline:"testgroup:*:12345:\n" -s exit:0 -x grep "^testgroup" ${HOME}/group
 }
diff --git a/pw/tests/pw_lock.sh b/pw/tests/pw_lock.sh
index 070a6f9..9f14e24 100755
--- a/pw/tests/pw_lock.sh
+++ b/pw/tests/pw_lock.sh
@@ -7,11 +7,11 @@
 atf_test_case user_locking cleanup
 user_locking_body() {
 	populate_etc_skel
-	pw -V ${HOME} useradd test || atf_fail "Creating test user"
-	pw -V ${HOME} lock test || atf_fail "Locking the user"
+	${PW} useradd test || atf_fail "Creating test user"
+	${PW} lock test || atf_fail "Locking the user"
 	atf_check -s exit:0 -o match:"^test:\*LOCKED\*\*:1001:" \
 		grep "^test:\*LOCKED\*\*:1001:" $HOME/master.passwd
-	pw -V ${HOME} unlock test || atf_fail "Locking the user"
+	${PW} unlock test || atf_fail "Locking the user"
 	atf_check -s exit:0 -o match:"^test:\*:1001:" \
 		grep "^test:\*:1001:" $HOME/master.passwd
 }
diff --git a/pw/tests/pw_useradd.sh b/pw/tests/pw_useradd.sh
new file mode 100755
index 0000000..48612ed
--- /dev/null
+++ b/pw/tests/pw_useradd.sh
@@ -0,0 +1,188 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+# Test add user
+atf_test_case user_add
+user_add_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test
+	atf_check -s exit:0 -o match:"^test:.*" \
+		grep "^test:.*" $HOME/master.passwd
+}
+
+# Test add user with option -N
+atf_test_case user_add_noupdate
+user_add_noupdate_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 -o match:"^test:.*" ${PW} useradd test -N
+	atf_check -s exit:1 -o empty grep "^test:.*" $HOME/master.passwd
+}
+
+# Test add user with comments
+atf_test_case user_add_comments
+user_add_comments_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test -c "Test User,work,123,456"
+	atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
+		grep "^test:.*:Test User,work,123,456:" $HOME/master.passwd
+}
+
+# Test add user with comments and option -N
+atf_test_case user_add_comments_noupdate
+user_add_comments_noupdate_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
+		${PW} useradd test -c "Test User,work,123,456" -N
+	atf_check -s exit:1 -o empty grep "^test:.*" $HOME/master.passwd
+}
+
+# Test add user with invalid comments
+atf_test_case user_add_comments_invalid
+user_add_comments_invalid_body() {
+	populate_etc_skel
+
+	atf_check -s exit:65 -e match:"invalid character" \
+		${PW} useradd test -c "Test User,work,123:456,456"
+	atf_check -s exit:1 -o empty \
+		grep "^test:.*:Test User,work,123:456,456:" $HOME/master.passwd
+}
+
+# Test add user with invalid comments and option -N
+atf_test_case user_add_comments_invalid_noupdate
+user_add_comments_invalid_noupdate_body() {
+	populate_etc_skel
+
+	atf_check -s exit:65 -e match:"invalid character" \
+		${PW} useradd test -c "Test User,work,123:456,456" -N
+	atf_check -s exit:1 -o empty grep "^test:.*" $HOME/master.passwd
+}
+
+# Test add user with alternate homedir
+atf_test_case user_add_homedir
+user_add_homedir_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test -d /foo/bar
+	atf_check -s exit:0 -o match:"^test:\*:.*::0:0:User &:/foo/bar:.*" \
+		${PW} usershow test
+}
+
+# Test add user with account expiration as an epoch date
+atf_test_case user_add_account_expiration_epoch
+user_add_account_expiration_epoch_body() {
+	populate_etc_skel
+
+	DATE=`date -j -v+1d "+%s"`
+	atf_check -s exit:0 ${PW} useradd test -e ${DATE}
+	atf_check -s exit:0 -o match:"^test:\*:.*::0:${DATE}:.*" \
+		${PW} usershow test
+}
+
+# Test add user with account expiration as a DD-MM-YYYY date
+atf_test_case user_add_account_expiration_date_numeric
+user_add_account_expiration_date_numeric_body() {
+	populate_etc_skel
+
+	DATE=`date -j -v+1d "+%d-%m-%Y"`
+	EPOCH=`date -j -f "%d-%m-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
+	atf_check -s exit:0 ${PW} useradd test -e ${DATE}
+	atf_check -s exit:0 -o match:"^test:\*:.*::0:${EPOCH}:User &:.*" \
+		${PW} usershow test
+}
+
+# Test add user with account expiration as a DD-MM-YYYY date
+atf_test_case user_add_account_expiration_date_month
+user_add_account_expiration_date_month_body() {
+	populate_etc_skel
+
+	DATE=`date -j -v+1d "+%d-%b-%Y"`
+	EPOCH=`date -j -f "%d-%b-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
+	atf_check -s exit:0 ${PW} useradd test -e ${DATE}
+	atf_check -s exit:0 -o match:"^test:\*:.*::0:${EPOCH}:User &:.*" \
+		${PW} usershow test
+}
+
+# Test add user with account expiration as a relative date
+atf_test_case user_add_account_expiration_date_relative
+user_add_account_expiration_date_relative_body() {
+	populate_etc_skel
+
+	EPOCH=`date -j -v+13m "+%s"`
+	BUF=`expr $EPOCH + 5`
+	atf_check -s exit:0 ${PW} useradd test -e +13o
+	TIME=`${PW} usershow test | awk -F ':' '{print $7}'`
+	[ ! -z $TIME -a $TIME -ge $EPOCH -a $TIME -lt $BUF ] || \
+		atf_fail "Expiration time($TIME) was not within $EPOCH - $BUF seconds."
+}
+
+# Test add user with password expiration as an epoch date
+atf_test_case user_add_password_expiration_epoch
+user_add_password_expiration_epoch_body() {
+	populate_etc_skel
+
+	DATE=`date -j -v+1d "+%s"`
+	atf_check -s exit:0 ${PW} useradd test -p ${DATE}
+	atf_check -s exit:0 -o match:"^test:\*:.*::${DATE}:0:.*" \
+		${PW} usershow test
+}
+
+# Test add user with password expiration as a DD-MM-YYYY date
+atf_test_case user_add_password_expiration_date_numeric
+user_add_password_expiration_date_numeric_body() {
+	populate_etc_skel
+
+	DATE=`date -j -v+1d "+%d-%m-%Y"`
+	EPOCH=`date -j -f "%d-%m-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
+	atf_check -s exit:0 ${PW} useradd test -p ${DATE}
+	atf_check -s exit:0 -o match:"^test:\*:.*::${EPOCH}:0:User &:.*" \
+		${PW} usershow test
+}
+
+# Test add user with password expiration as a DD-MMM-YYYY date
+atf_test_case user_add_password_expiration_date_month
+user_add_password_expiration_date_month_body() {
+	populate_etc_skel
+
+	DATE=`date -j -v+1d "+%d-%b-%Y"`
+	EPOCH=`date -j -f "%d-%b-%Y %H:%M:%S" "${DATE} 00:00:00" "+%s"`
+	atf_check -s exit:0 ${PW} useradd test -p ${DATE}
+	atf_check -s exit:0 -o match:"^test:\*:.*::${EPOCH}:0:User &:.*" \
+		${PW} usershow test
+}
+
+# Test add user with password expiration as a relative date
+atf_test_case user_add_password_expiration_date_relative
+user_add_password_expiration_date_relative_body() {
+	populate_etc_skel
+
+	EPOCH=`date -j -v+13m "+%s"`
+	BUF=`expr $EPOCH + 5`
+	atf_check -s exit:0 ${PW} useradd test -p +13o
+	TIME=`${PW} usershow test | awk -F ':' '{print $6}'`
+	[ ! -z $TIME -a $TIME -ge $EPOCH -a $TIME -lt $BUF ] || \
+		atf_fail "Expiration time($TIME) was not within $EPOCH - $BUF seconds."
+}
+
+atf_init_test_cases() {
+	atf_add_test_case user_add
+	atf_add_test_case user_add_noupdate
+	atf_add_test_case user_add_comments
+	atf_add_test_case user_add_comments_noupdate
+	atf_add_test_case user_add_comments_invalid 
+	atf_add_test_case user_add_comments_invalid_noupdate
+	atf_add_test_case user_add_homedir
+	atf_add_test_case user_add_account_expiration_epoch
+	atf_add_test_case user_add_account_expiration_date_numeric
+	atf_add_test_case user_add_account_expiration_date_month
+	atf_add_test_case user_add_account_expiration_date_relative
+	atf_add_test_case user_add_password_expiration_epoch
+	atf_add_test_case user_add_password_expiration_date_numeric
+	atf_add_test_case user_add_password_expiration_date_month
+	atf_add_test_case user_add_password_expiration_date_relative
+}
diff --git a/pw/tests/pw_userdel.sh b/pw/tests/pw_userdel.sh
new file mode 100755
index 0000000..71a7033
--- /dev/null
+++ b/pw/tests/pw_userdel.sh
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+
+# Test that a user can be deleted when another user is part of this
+# user's default group and does not go into an infinate loop.
+# PR: 191427
+atf_test_case rmuser_seperate_group cleanup
+rmuser_seperate_group_head() {
+	atf_set "timeout" "30"
+}
+rmuser_seperate_group_body() {
+	populate_etc_skel
+	${PW} useradd test || atf_fail "Creating test user"
+	${PW} groupmod test -M 'test,root' || \
+		atf_fail "Modifying the group"
+	${PW} userdel test || atf_fail "Delete the test user"
+}
+
+
+atf_test_case user_do_not_try_to_delete_root_if_user_unknown
+user_do_not_try_to_delete_root_if_user_unknown_head() {
+	atf_set "descr" \
+		"Make sure not to try to remove root if deleting an unknown user"
+}
+user_do_not_try_to_delete_root_if_user_unknown_body() {
+	populate_etc_skel
+	atf_check -e inline:"pw: -u expects a number\n" -s exit:64 -x \
+		${PW} userdel -u plop
+}
+
+atf_init_test_cases() {
+	atf_add_test_case rmuser_seperate_group
+	atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown
+}
diff --git a/pw/tests/pw_usermod.sh b/pw/tests/pw_usermod.sh
new file mode 100755
index 0000000..88bd316
--- /dev/null
+++ b/pw/tests/pw_usermod.sh
@@ -0,0 +1,112 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+# Test modifying a user
+atf_test_case user_mod
+user_mod_body() {
+	populate_etc_skel
+
+	atf_check -s exit:67 -e match:"no such user" ${PW} usermod test
+	atf_check -s exit:0 ${PW} useradd test
+	atf_check -s exit:0 ${PW} usermod test
+	atf_check -s exit:0 -o match:"^test:.*" \
+		grep "^test:.*" $HOME/master.passwd
+}
+
+# Test modifying a user with option -N
+atf_test_case user_mod_noupdate
+user_mod_noupdate_body() {
+	populate_etc_skel
+
+	atf_check -s exit:67 -e match:"no such user" ${PW} usermod test -N
+	atf_check -s exit:0 ${PW} useradd test
+	atf_check -s exit:0 -o match:"^test:.*" ${PW} usermod test -N
+	atf_check -s exit:0 -o match:"^test:.*" \
+		grep "^test:.*" $HOME/master.passwd
+}
+
+# Test modifying a user with comments
+atf_test_case user_mod_comments
+user_mod_comments_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test -c "Test User,home,123,456"
+	atf_check -s exit:0 ${PW} usermod test -c "Test User,work,123,456"
+	atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
+		grep "^test:.*:Test User,work,123,456:" $HOME/master.passwd
+}
+
+# Test modifying a user with comments with option -N
+atf_test_case user_mod_comments_noupdate
+user_mod_comments_noupdate_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test -c "Test User,home,123,456"
+	atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
+		${PW} usermod test -c "Test User,work,123,456" -N
+	atf_check -s exit:0 -o match:"^test:.*:Test User,home,123,456:" \
+		grep "^test:.*:Test User,home,123,456:" $HOME/master.passwd
+}
+
+# Test modifying a user with invalid comments
+atf_test_case user_mod_comments_invalid
+user_mod_comments_invalid_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test
+	atf_check -s exit:65 -e match:"invalid character" \
+		${PW} usermod test -c "Test User,work,123:456,456"
+	atf_check -s exit:1 -o empty \
+		grep "^test:.*:Test User,work,123:456,456:" $HOME/master.passwd
+	atf_check -s exit:0 -o match:"^test:\*" \
+		grep "^test:\*" $HOME/master.passwd
+}
+
+# Test modifying a user with invalid comments with option -N
+atf_test_case user_mod_comments_invalid_noupdate
+user_mod_comments_invalid_noupdate_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test
+	atf_check -s exit:65 -e match:"invalid character" \
+		${PW} usermod test -c "Test User,work,123:456,456" -N
+	atf_check -s exit:1 -o empty \
+		grep "^test:.*:Test User,work,123:456,456:" $HOME/master.passwd
+	atf_check -s exit:0 -o match:"^test:\*" \
+		grep "^test:\*" $HOME/master.passwd
+}
+
+# Test modifying a user name with -l
+atf_test_case user_mod_name
+user_mod_name_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd foo
+	atf_check -s exit:0 ${PW} usermod foo -l "bar"
+	atf_check -s exit:0 -o match:"^bar:.*" \
+		grep "^bar:.*" $HOME/master.passwd
+}
+
+# Test modifying a user name with -l with option -N
+atf_test_case user_mod_name_noupdate
+user_mod_name_noupdate_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd foo
+	atf_check -s exit:0 -o match:"^bar:.*" ${PW} usermod foo -l "bar" -N
+	atf_check -s exit:0 -o match:"^foo:.*" \
+		grep "^foo:.*" $HOME/master.passwd
+}
+
+atf_init_test_cases() {
+	atf_add_test_case user_mod
+	atf_add_test_case user_mod_noupdate
+	atf_add_test_case user_mod_comments
+	atf_add_test_case user_mod_comments_noupdate
+	atf_add_test_case user_mod_comments_invalid 
+	atf_add_test_case user_mod_comments_invalid_noupdate 
+	atf_add_test_case user_mod_name
+	atf_add_test_case user_mod_name_noupdate
+}
diff --git a/pw/tests/pw_usernext.sh b/pw/tests/pw_usernext.sh
new file mode 100755
index 0000000..89f938e
--- /dev/null
+++ b/pw/tests/pw_usernext.sh
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+# Test usernext after adding a random number of new users.
+atf_test_case usernext
+usernext_body() {
+	populate_etc_skel
+
+	CURRENT=`${PW} usernext | sed -e 's/:.*//'`
+	RANDOM=`jot -r 1 1 150`
+	MAX=`expr ${CURRENT} + ${RANDOM}`
+	while [ "${CURRENT}" -lt "${MAX}" ]
+	do
+		atf_check -s exit:0 ${PW} useradd test${CURRENT}
+		CURRENT=`expr ${CURRENT} + 1`
+	done
+	atf_check -s exit:0 -o match:"${CURRENT}:${CURRENT}" \
+		${PW} usernext
+}
+
+# Test usernext when multiple users are added to the same group so 
+# that group id doesn't increment at the same pace as new users.
+atf_test_case usernext_assigned_group
+usernext_assigned_group_body() {
+	populate_etc_skel
+
+	CURRENT=`${PW} usernext | sed -e 's/:.*//'`
+	CURRENTGID=`${PW} groupnext`
+	RANDOM=`jot -r 1 1 150`
+	MAX=`expr ${CURRENT} + ${RANDOM}`
+	while [ "${CURRENT}" -lt "${MAX}" ]
+	do
+		atf_check -s exit:0 ${PW} useradd -n test${CURRENT} -g 0
+		CURRENT=`expr ${CURRENT} + 1`
+	done
+	atf_check -s exit:0 -o match:"${CURRENT}:${CURRENTGID}" \
+		${PW} usernext
+}
+
+atf_init_test_cases() {
+	atf_add_test_case usernext
+	atf_add_test_case usernext_assigned_group
+}