diff options
| -rw-r--r-- | source4/script/tests/Samba4.pm | 10 | ||||
| -rwxr-xr-x | source4/script/tests/selftest.pl | 10 |
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" |