Author: abartlet Date: 2007-08-10 08:46:29 +0000 (Fri, 10 Aug 2007) New Revision: 24301
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24301 Log: 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 Modified: branches/SAMBA_4_0/source/selftest/Samba4.pm branches/SAMBA_4_0/source/selftest/test_member.sh Changeset: Modified: branches/SAMBA_4_0/source/selftest/Samba4.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/Samba4.pm 2007-08-10 07:40:50 UTC (rev 24300) +++ branches/SAMBA_4_0/source/selftest/Samba4.pm 2007-08-10 08:46:29 UTC (rev 24301) @@ -298,6 +298,7 @@ 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 Modified: branches/SAMBA_4_0/source/selftest/test_member.sh =================================================================== --- branches/SAMBA_4_0/source/selftest/test_member.sh 2007-08-10 07:40:50 UTC (rev 24300) +++ branches/SAMBA_4_0/source/selftest/test_member.sh 2007-08-10 08:46:29 UTC (rev 24301) @@ -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"