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)

diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm
index 1da0439757e5baccf96181965047480631c12bd8..597cc5d50cf9df193980f50be692d697274fefd0 100644 (file)
--- 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 29e3730342d1f9290557037bceb02129ff396100..88b382fbebc365f572c9d7d4a9573a76e5d39d94 100755 (executable)
--- 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"