From 726ee12bb450821f929e05ca1c708f3e33f909cf Mon Sep 17 00:00:00 2001 From: Theresa Halloran Date: Thu, 19 May 2011 16:17:07 -0400 Subject: s4/samba-tool: Move samba-tool enableaccount to samba-tool user enable command. Signed-off-by: Andrew Tridgell --- source4/setup/tests/blackbox_newuser.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/setup/tests/blackbox_newuser.sh') diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh index fe5d051481..71c957bef3 100755 --- a/source4/setup/tests/blackbox_newuser.sh +++ b/source4/setup/tests/blackbox_newuser.sh @@ -26,8 +26,8 @@ testit "newuser" $samba_tool newuser $CONFIG --given-name="User" --surname="Test testit "newuser" $samba_tool newuser $CONFIG --use-username-as-cn --given-name="User1" --surname="Tester1" --initials="UT1" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" NewUser1 testp@ssw0Rd # check the enable account script -testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser -testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser1 +testit "enableaccount" $samba_tool user enable $CONFIG NewUser +testit "enableaccount" $samba_tool user enable $CONFIG NewUser1 # check the enable account script testit "setpassword" $samba_tool setpassword $CONFIG NewUser --newpassword=testp@ssw0Rd2 -- cgit From 23177b5f44815bc5b46943c70d37dc626ed60288 Mon Sep 17 00:00:00 2001 From: Theresa Halloran Date: Thu, 19 May 2011 16:24:00 -0400 Subject: s4:samba-tool: Move samba-tool setexpiry to samba-tool user setexpiry Signed-off-by: Andrew Tridgell --- source4/setup/tests/blackbox_newuser.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/setup/tests/blackbox_newuser.sh') diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh index 71c957bef3..5ce634a70d 100755 --- a/source4/setup/tests/blackbox_newuser.sh +++ b/source4/setup/tests/blackbox_newuser.sh @@ -34,9 +34,9 @@ testit "setpassword" $samba_tool setpassword $CONFIG NewUser --newpassword=testp testit "setpassword" $samba_tool setpassword $CONFIG NewUser1 --newpassword=testp@ssw0Rd2 # check the setexpiry script -testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser --noexpiry -testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser1 --noexpiry -testit "expiry" $samba_tool setexpiry $CONFIG NewUser --days=7 -testit "expiry" $samba_tool setexpiry $CONFIG NewUser1 --days=7 +testit "noexpiry" $samba_tool user setexpiry $CONFIG NewUser --noexpiry +testit "noexpiry" $samba_tool user setexpiry $CONFIG NewUser1 --noexpiry +testit "expiry" $samba_tool user setexpiry $CONFIG NewUser --days=7 +testit "expiry" $samba_tool user setexpiry $CONFIG NewUser1 --days=7 exit $failed -- cgit