diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-08-10 08:46:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:01:37 -0500 |
| commit | 12e660f7611436c805c2f81f593d881a62eb5408 (patch) | |
| tree | 5e489595636cc9a9174ed2bf05526f2da58e4667 /source4 | |
| parent | cf9972a1bdb056da7ef55ae12d0ddbc9a02402b9 (diff) | |
| download | samba-12e660f7611436c805c2f81f593d881a62eb5408.tar.gz samba-12e660f7611436c805c2f81f593d881a62eb5408.tar.bz2 samba-12e660f7611436c805c2f81f593d881a62eb5408.zip | |
r24301: The less escape characters the better. This changes the winbind
seperator to /, which is not an escape character, and uses the fact
that we always support / as the DOMAIN/username seperator.
Andrew Bartlett
(This used to be commit 84c1bea458518a1550619a5103d8237fc4db2503)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/selftest/Samba4.pm | 1 | ||||
| -rwxr-xr-x | source4/selftest/test_member.sh | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm index 1da0439757..597cc5d50c 100644 --- a/source4/selftest/Samba4.pm +++ b/source4/selftest/Samba4.pm @@ -298,6 +298,7 @@ sub provision($$$$$$) setup directory = $self->{setupdir} js include = $srcdir/scripting/libjs winbindd socket directory = $winbindd_socket_dir + winbind separator = / name resolve order = bcast interfaces = $interfaces tls dh params file = $tlsdir/dhparms.pem diff --git a/source4/selftest/test_member.sh b/source4/selftest/test_member.sh index 29e3730342..88b382fbeb 100755 --- a/source4/selftest/test_member.sh +++ b/source4/selftest/test_member.sh @@ -3,6 +3,6 @@ incdir=`dirname $0` . $incdir/test_functions.sh -plantest "RPC-ECHO against member server with local creds" member $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME\\\\\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*" -plantest "RPC-ECHO against member server with domain creds" member $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$DOMAIN\\\\\$DC_USERNAME"%"\$DC_PASSWORD" RPC-ECHO "$*" -plantest "wbinfo -a against member server with domain creds" member $VALGRIND bin/wbinfo -a "\$DOMAIN\\\\\$DC_USERNAME"%"\$DC_PASSWORD"
\ No newline at end of file +plantest "RPC-ECHO against member server with local creds" member $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*" +plantest "RPC-ECHO against member server with domain creds" member $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD" RPC-ECHO "$*" +plantest "wbinfo -a against member server with domain creds" member $VALGRIND bin/wbinfo -a "\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD" |