summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-04-11 12:10:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:57 -0500
commitf3303bc8f6c175759e064f08924bb730c14d319b (patch)
treee48e5eddcc1d5364a3158b482eb5b86b1fd90293 /source4/script
parentf57ebf3f1269218e824cab2b346ab3907bccb9bf (diff)
downloadsamba-f3303bc8f6c175759e064f08924bb730c14d319b.tar.gz
samba-f3303bc8f6c175759e064f08924bb730c14d319b.tar.bz2
samba-f3303bc8f6c175759e064f08924bb730c14d319b.zip
r22170: To get the smbclient blackbox test to pass again, we need to get the
private dir to contain a valid machine account. It isn't really valid it use the DC's account any more, so extend this script to also join the domain. This nicely tests out some previously untested code too! Andrew Bartlett (This used to be commit 12f4e6033ed11a010211a4295424588f44f7e5e0)
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/tests/selftest.pl17
1 files changed, 11 insertions, 6 deletions
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 6886f8231e..a9ad56d312 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -448,6 +448,14 @@ sub write_clientconf($$)
my $abs_srcdir = cwd();
+ mkdir "$prefix/client" unless -d "$prefix/client";
+
+ if ( -d "$prefix/client/private" ) {
+ unlink <$prefix/client/private/*>;
+ } else {
+ mkdir("$prefix/client/private");
+ }
+
open(CF, ">$conffile");
print CF "[global]\n";
if (defined($ENV{VALGRIND})) {
@@ -456,8 +464,7 @@ sub write_clientconf($$)
print CF "\ticonv:native = false\n";
}
print CF
-" netbios name = localtest
- netbios aliases = localhost
+" netbios name = client
";
if (defined($vars->{DOMAIN})) {
print CF "\tworkgroup = $vars->{DOMAIN}\n";
@@ -465,9 +472,6 @@ sub write_clientconf($$)
if (defined($vars->{REALM})) {
print CF "\trealm = $vars->{REALM}\n";
}
- if (defined($vars->{PIDDIR})) {
- print CF "\tpid directory = $vars->{PIDDIR}\n";
- }
if (defined($vars->{NCALRPCDIR})) {
print CF "\tncalrpc dir = $vars->{NCALRPCDIR}\n";
}
@@ -475,6 +479,7 @@ sub write_clientconf($$)
print CF "\twinbindd socket directory = $vars->{WINBINDD_SOCKET_DIR}\n";
}
print CF "
+ private dir = $abs_srcdir/$prefix/client/private
js include = $abs_srcdir/scripting/libjs
name resolve order = bcast
interfaces = $interfaces
@@ -483,8 +488,8 @@ sub write_clientconf($$)
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
+#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
";
close(CF);