summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-28 08:57:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:42 -0500
commitc1195e0e6048ab78aaa1daf5d031fd61e7e21e56 (patch)
tree6340de82f55343c4c86c67271f5bd9547c0ee3c0
parente5b0977897fe1d936acd9cf972dc227277c4a017 (diff)
downloadsamba-c1195e0e6048ab78aaa1daf5d031fd61e7e21e56.tar.gz
samba-c1195e0e6048ab78aaa1daf5d031fd61e7e21e56.tar.bz2
samba-c1195e0e6048ab78aaa1daf5d031fd61e7e21e56.zip
r22549: export some more info ipaddress and in member env also the
details of the dc metze (This used to be commit 0c8c1c55f4047e98848028927b7870d5972e7513)
-rw-r--r--source4/script/tests/Samba4.pm10
-rwxr-xr-xsource4/script/tests/selftest.pl10
2 files changed, 20 insertions, 0 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 4fa6ba5873..0ed3f1ee43 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -612,7 +612,9 @@ sub provision($$$$$)
KRB5_CONFIG => $krb5_config,
PIDDIR => $piddir,
SERVER => $server,
+ SERVER_IP => $ifaceipv4,
NETBIOSNAME => $netbiosname,
+ NETBIOSALIAS => $server,
LDAP_URI => $ldap_uri,
DOMAIN => $domain,
USERNAME => $username,
@@ -665,6 +667,14 @@ sub provision_member($$$)
$ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo";
$ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log";
$ret->{SMBD_TEST_LOG_POS} = 0;
+
+ $ret->{DC_SERVER} = $dcvars->{SERVER};
+ $ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP};
+ $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
+ $ret->{DC_NETBIOSALIAS} = $dcvars->{NETBIOSALIAS};
+ $ret->{DC_USERNAME} = $dcvars->{USERNAME};
+ $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+
return $ret;
}
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 4f9c8afe06..1d70a4fa52 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -680,13 +680,23 @@ my @exported_envvars = (
"DOMAIN",
"REALM",
+ # domain controller stuff
+ "DC_SERVER",
+ "DC_SERVER_IP",
+ "DC_NETBIOSNAME",
+ "DC_NETBIOSALIAS",
+
# server stuff
"SERVER",
+ "SERVER_IP",
"NETBIOSNAME",
+ "NETBIOSALIAS",
# user stuff
"USERNAME",
"PASSWORD",
+ "DC_USERNAME",
+ "DC_PASSWORD",
# misc stuff
"KRB5_CONFIG"