diff options
| author | Günther Deschner <gd@samba.org> | 2009-05-28 10:40:22 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-05-28 10:40:22 +0200 |
| commit | 7a5475f098c6a20f867adc081ca455e6c393755b (patch) | |
| tree | 83bae4fa03088bfc1472ad56ea296e469ccf2278 | |
| parent | ebf8df35c9583619a012e85964f2ad5187a199fe (diff) | |
| download | samba-7a5475f098c6a20f867adc081ca455e6c393755b.tar.gz samba-7a5475f098c6a20f867adc081ca455e6c393755b.tar.bz2 samba-7a5475f098c6a20f867adc081ca455e6c393755b.zip | |
s3-selftest: use nss_wrapper.pl as "add user to group" and "delete user from group" script.
Guenther
| -rw-r--r-- | selftest/target/Samba3.pm | 12 | ||||
| -rwxr-xr-x | 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 30453f2e9b..95d2a8253f 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -458,11 +458,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 1f3ad761b2..956c5af77b 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -216,11 +216,13 @@ cat >$SERVERCONFFILE<<EOF lanman auth = yes time server = yes - add user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u - add group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_GROUP --type group --action add --name %g - add machine script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u - delete user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u - delete group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_GROUP --type group --action delete --name %g + add user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --passwd_path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u + add group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type group --action add --name %g + add user to group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type member --action add --name %g --member %u --passwd_path $NSS_WRAPPER_PASSWD + add machine script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --passwd_path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u + delete user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --passwd_path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u + delete group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type group --action delete --name %g + delete user from group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type member --action delete --name %g --member %u --passwd_path $NSS_WRAPPER_PASSWD kernel oplocks = no kernel change notify = no |