From e9963e1c4ed5daaf02734af1e0fdf5c4c9c14804 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Thu, 28 May 2009 10:40:22 +0200 Subject: [PATCH] s3-selftest: use nss_wrapper.pl as "add user to group" and "delete user from group" script. Guenther (cherry picked from commit 7a5475f098c6a20f867adc081ca455e6c393755b) (cherry picked from commit 1a129e79baac7c7ebbc63c9e077ede4b123cf390) --- selftest/target/Samba3.pm | 12 +++++++----- source3/script/tests/selftest.sh | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index c62d454800b..c636be22f1f 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -456,11 +456,13 @@ sub provision($$$$$$) time server = yes - add user script = $nss_wrapper_pl --path $nss_wrapper_passwd --type passwd --action add --name %u - add group script = $nss_wrapper_pl --path $nss_wrapper_group --type group --action add --name %g - add machine script = $nss_wrapper_pl --path $nss_wrapper_passwd --type passwd --action add --name %u - delete user script = $nss_wrapper_pl --path $nss_wrapper_passwd --type passwd --action delete --name %u - delete group script = $nss_wrapper_pl --path $nss_wrapper_group --type group --action delete --name %g + add user script = $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action add --name %u + add group script = $nss_wrapper_pl --group_path $nss_wrapper_group --type group --action add --name %g + add machine script = $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action add --name %u + add user to group script = $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type member --action add --member %u --name %g --group_path $nss_wrapper_group + delete user script = $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type passwd --action delete --name %u + delete group script = $nss_wrapper_pl --group_path $nss_wrapper_group --type group --action delete --name %g + delete user from group script = $nss_wrapper_pl --passwd_path $nss_wrapper_passwd --type member --action delete --member %u --name %g --group_path $nss_wrapper_group kernel oplocks = no kernel change notify = no diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 6174b0fffa0..b0de877ab96 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -216,11 +216,13 @@ cat >$SERVERCONFFILE<