diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-18 16:09:30 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-19 14:26:58 +1000 |
| commit | aed450df0b38d6648cbfd3229722db82a85ad746 (patch) | |
| tree | 356e3abfc86b59288a431cd99d6c166d70acbdf6 | |
| parent | 36d4bbfeefc8e3818b8cfc2c64941715bded1267 (diff) | |
| download | samba-aed450df0b38d6648cbfd3229722db82a85ad746.tar.gz samba-aed450df0b38d6648cbfd3229722db82a85ad746.tar.bz2 samba-aed450df0b38d6648cbfd3229722db82a85ad746.zip | |
s4-selftest: Avoid duplicating the servers IP in the provision() sub arguments.
This should make it easier to change the IP address.
Andrew Bartlett
| -rw-r--r-- | selftest/target/Samba4.pm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 8054ee7527..a5a77bb193 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -677,6 +677,11 @@ sub provision_raw_step1($$) $self->mk_keyblobs($ctx->{tlsdir}); + #Default the KDC IP to the server's IP + if (not defined($ctx->{kdc_ipv4})) { + $ctx->{kdc_ipv4} = $ctx->{ipv4}; + } + $self->mk_krb5_conf($ctx); open(PWD, ">$ctx->{nsswrap_passwd}"); @@ -1035,7 +1040,7 @@ sub provision_dc($$) "2008", 1, "locDCpass1", - "127.0.0.1", "netbios aliases = DC1"); + undef, "netbios aliases = DC1"); return undef unless(defined $ret); unless($self->add_wins_config("$prefix/private")) { @@ -1066,7 +1071,7 @@ sub provision_fl2000dc($$) "2000", 5, "locDCpass5", - "127.0.0.5", ""); + undef, ""); unless($self->add_wins_config("$prefix/private")) { warn("Unable to add wins configuration"); @@ -1089,7 +1094,7 @@ sub provision_fl2003dc($$) "2003", 6, "locDCpass6", - "127.0.0.6", ""); + undef, ""); unless($self->add_wins_config("$prefix/private")) { warn("Unable to add wins configuration"); @@ -1112,7 +1117,7 @@ sub provision_fl2008r2dc($$) "2008_R2", 7, "locDCpass7", - "127.0.0.7", ""); + undef, ""); unless ($self->add_wins_config("$prefix/private")) { warn("Unable to add wins configuration"); |