diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-26 19:28:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:18 -0500 |
| commit | 7ac97bbbdb85b08976de2b850021fbd7a0c7d112 (patch) | |
| tree | 811835bc5190dff498ebe864bc39def1b0bcdf92 | |
| parent | 99f8d8c45dc953b0d30b411457dad516d84844ee (diff) | |
| download | samba-7ac97bbbdb85b08976de2b850021fbd7a0c7d112.tar.gz samba-7ac97bbbdb85b08976de2b850021fbd7a0c7d112.tar.bz2 samba-7ac97bbbdb85b08976de2b850021fbd7a0c7d112.zip | |
r25361: Specify share correctly for RPC-SAMBA3-SHARESEC, allow overriding share from command-line in smbtorture.
(This used to be commit b3f2eafa0489fe533c93f2b224bbd999cf069aa1)
| -rwxr-xr-x | source4/selftest/test_rpc.sh | 6 | ||||
| -rw-r--r-- | source4/torture/smbtorture.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/selftest/test_rpc.sh b/source4/selftest/test_rpc.sh index 39efccc0d3..6fc959b312 100755 --- a/source4/selftest/test_rpc.sh +++ b/source4/selftest/test_rpc.sh @@ -2,7 +2,7 @@ # add tests to this list as they start passing, so we test # that they stay passing -ncacn_np_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-SAMSYNC RPC-SAMBA3SESSIONKEY RPC-SAMBA3-SHARESEC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-LSA RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT" +ncacn_np_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-SAMSYNC RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-LSA RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT" ncalrpc_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-DRSUAPI RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT" ncacn_ip_tcp_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-DSSYNC RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT" slow_ncacn_np_tests="RPC-SAMLOGON RPC-SAMR RPC-SAMR-USERS RPC-SAMR-PASSWORDS" @@ -12,7 +12,7 @@ slow_ncacn_ip_tcp_tests="RPC-SAMR RPC-SAMR-PASSWORDS RPC-CRACKNAMES" incdir=`dirname $0` . $incdir/test_functions.sh -all_tests="$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests $slow_ncalrpc_tests $slow_ncacn_np_tests $slow_ncacn_ip_tcp_tests RPC-SECRETS" +all_tests="$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests $slow_ncalrpc_tests $slow_ncacn_np_tests $slow_ncacn_ip_tcp_tests RPC-SECRETS RPC-SAMBA3-SHARESEC" # Make sure all tests get run for t in `$samba4bindir/smbtorture --list | grep "^RPC-"` @@ -34,6 +34,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do name="$t on $transport with $bindoptions" plantest "$name" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*" done + plantest "RPC-SAMBA3-SHARESEC on $transport with $bindoptions" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN --option=torture:share=tmp $t "$*" done done @@ -56,3 +57,4 @@ for bindoptions in connect $VALIDATE ; do done done done + diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index a148081fb3..020d49497f 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -633,7 +633,8 @@ int main(int argc,char *argv[]) return false; } lp_set_cmdline("torture:host", binding_struct->host); - lp_set_cmdline("torture:share", "IPC$"); + if (lp_parm_string(NULL, "torture", "share") == NULL) + lp_set_cmdline("torture:share", "IPC$"); lp_set_cmdline("torture:binding", argv_new[1]); } else { lp_set_cmdline("torture:host", host); |