r22134: Create different smb.conf file for the client side. This should make use with Samba 3 or windows easier as well as environments.

(This used to be commit a32cdc06c39b07fbc7a3015ef059cc9143fb6e20)

2 files changed, 33 insertions, 12 deletions

diff --git a/source4/script/tests/mktestdc.sh b/source4/script/tests/mktestdc.sh
index 3c5cc58353..ee4a99c8a3 100755
--- a/source4/script/tests/mktestdc.sh
+++ b/source4/script/tests/mktestdc.sh
@@ -43,8 +43,6 @@ cd $PREFIX
 PREFIX_ABS=`pwd`
 cd $oldpwd
 
-TEST_DATA_PREFIX=$PREFIX_ABS
-
 TMPDIR=$PREFIX_ABS/tmp
 ETCDIR=$PREFIX_ABS/etc
 PIDDIR=$PREFIX_ABS/pid
@@ -61,15 +59,8 @@ LDAPDIR=$PREFIX_ABS/ldap
 rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $ETCDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $LDAPDIR/db $LDAPDIR/db/bdb-logs $LDAPDIR/db/tmp
 
-if [ -z "$VALGRIND" ]; then
-    nativeiconv="true"
-else
-    nativeiconv="false"
-fi
-
 cat >$CONFFILE<<EOF
 [global]
-	iconv:native = $nativeiconv
 	netbios name = $NETBIOSNAME
 	netbios aliases = $SERVER
 	workgroup = $DOMAIN
@@ -92,7 +83,6 @@ cat >$CONFFILE<<EOF
 	server max protocol = SMB2
 	notify:inotify = false
 	ldb:nosync = true
-	torture:basedir = $TEST_DATA_PREFIX
 
 	system:anonymous = true
 #We don't want to pass our self-tests if the PAC code is wrong
@@ -283,7 +273,6 @@ $srcdir/bin/ldbadd -H $PRIVATEDIR/wins_config.ldb < $PRIVATEDIR/wins_config.ldif
 
 echo "KRB5_CONFIG=$KRB5_CONFIG"
 echo "PREFIX_ABS=$PREFIX_ABS"
-echo "TEST_DATA_PREFIX=$TEST_DATA_PREFIX"
 echo "CONFIGURATION=$CONFIGURATION"
 echo "CONFFILE=$CONFFILE"
 echo "SLAPD_CONF=$SLAPD_CONF"
@@ -303,3 +292,5 @@ echo "PREFIX=$PREFIX"
 echo "LDAPDIR=$LDAPDIR"
 echo "PROVISION_OPTIONS=$PROVISION_OPTIONS"
 echo "PROVISION_ACI=$PROVISION_ACI"
+echo "WINBINDD_SOCKET_DIR=$WINBINDD_SOCKET_DIR"
+echo "NCALRPCDIR=$NCALRPCDIR"
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index caba948c9b..1b04e494ea 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -443,9 +443,39 @@ my $interfaces = join(',', ("127.0.0.6/8",
 						 "127.0.0.10/8",
 						 "127.0.0.11/8"));
 
+
+
+my $conffile = "$prefix/client.conf";
+open(CF, ">$conffile");
+print CF "[global]\n";
+if (defined($ENV{VALGRIND})) {
+	print CF "iconv:native = true\n";
+} else {
+	print CF "iconv:native = false\n";
+}
+print CF "
+	workgroup = $testenv_vars->{DOMAIN}
+	realm = $testenv_vars->{REALM}
+	ncalrpc dir = $testenv_vars->{NCALRPCDIR}
+	js include = $srcdir/scripting/libjs
+	winbindd socket directory = $testenv_vars->{WINBINDD_SOCKET_DIR}
+	name resolve order = bcast
+	interfaces = 127.0.0.1/8
+	panic action = $srcdir/script/gdb_backtrace \%PID\% \%PROG\%
+	max xmit = 32K
+	notify:inotify = false
+	ldb:nosync = true
+	system:anonymous = true
+#We don't want to pass our self-tests if the PAC code is wrong
+	torture:basedir = st
+	gensec:require_pac = true
+	pid directory = $testenv_vars->{PIDDIR}
+";
+close(CF);
+
 my @torture_options = ();
 push (@torture_options, "--option=interfaces=$interfaces");
-push (@torture_options, $testenv_vars->{CONFIGURATION});
+push (@torture_options, "--configfile=$conffile");
 # ensure any one smbtorture call doesn't run too long
 push (@torture_options, "--maximum-runtime=$torture_maxtime");
 push (@torture_options, "--target=$opt_target");