diff options
| author | Bob Campbell <bobcampbell@catalyst.net.nz> | 2017-01-10 09:20:47 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-07-02 17:35:20 +0200 |
| commit | c0a7d2bacdacc7a43e04f3b450ea069c000b3d8d (patch) | |
| tree | f7d20b0d14aff65f2eb7f14aaafddfa435e4b397 /selftest | |
| parent | a6bd91f4ec3c329d6363710cc50662460697f630 (diff) | |
| download | samba-c0a7d2bacdacc7a43e04f3b450ea069c000b3d8d.tar.gz | |
selftest: Do not force run of kcc at start of selftest
This should help to avoid clashes between periodic and manual runs of
the KCC during autobuild.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Bob Campbell <bobcampbell@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba4.pm | 53 |
1 files changed, 1 insertions, 52 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index ea81d7dd9da..7d9fe3ca9b8 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -2289,27 +2289,11 @@ sub setup_vampire_dc($$$$) # force replicated DC to update repsTo/repsFrom # for vampired partitions my $samba_tool = Samba::bindir_path($self, "samba-tool"); - my $cmd = ""; - $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; - if (defined($env->{RESOLV_WRAPPER_CONF})) { - $cmd .= "RESOLV_WRAPPER_CONF=\"$env->{RESOLV_WRAPPER_CONF}\" "; - } else { - $cmd .= "RESOLV_WRAPPER_HOSTS=\"$env->{RESOLV_WRAPPER_HOSTS}\" "; - } - $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; - $cmd .= "KRB5CCNAME=\"$env->{KRB5_CCACHE}\" "; - $cmd .= " $samba_tool drs kcc -k no $env->{DC_SERVER}"; - $cmd .= " $env->{CONFIGURATION}"; - $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; - unless (system($cmd) == 0) { - warn("Failed to exec kcc on remote DC\n$cmd"); - return undef; - } # as 'vampired' dc may add data in its local replica # we need to synchronize data between DCs my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM})); - $cmd = ""; + my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; if (defined($env->{RESOLV_WRAPPER_CONF})) { $cmd .= "RESOLV_WRAPPER_CONF=\"$env->{RESOLV_WRAPPER_CONF}\" "; @@ -2382,30 +2366,6 @@ sub setup_promoted_dc($$$) # for vampired partitions my $samba_tool = Samba::bindir_path($self, "samba-tool"); my $cmd = ""; - $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; - $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; - $cmd .= "KRB5CCNAME=\"$env->{KRB5_CCACHE}\" "; - $cmd .= " $samba_tool drs kcc $env->{DC_SERVER}"; - $cmd .= " $env->{CONFIGURATION}"; - $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; - unless (system($cmd) == 0) { - warn("Failed to exec kcc on remote DC\n$cmd"); - return undef; - } - - my $samba_tool = Samba::bindir_path($self, "samba-tool"); - my $cmd = ""; - $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; - $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; - $cmd .= "KRB5CCNAME=\"$env->{KRB5_CCACHE}\" "; - $cmd .= " $samba_tool drs kcc $env->{SERVER}"; - $cmd .= " $env->{CONFIGURATION}"; - $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; - unless (system($cmd) == 0) { - warn("Failed to exec kcc on promoted DC\n$cmd"); - return undef; - } - # as 'vampired' dc may add data in its local replica # we need to synchronize data between DCs my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM})); @@ -2449,17 +2409,6 @@ sub setup_subdom_dc($$$) # for primary domain partitions my $samba_tool = Samba::bindir_path($self, "samba-tool"); my $cmd = ""; - $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; - $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; - $cmd .= "KRB5CCNAME=\"$env->{KRB5_CCACHE}\" "; - $cmd .= " $samba_tool drs kcc $env->{DC_SERVER}"; - $cmd .= " $env->{CONFIGURATION}"; - $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD} --realm=$dc_vars->{DC_REALM}"; - unless (system($cmd) == 0) { - warn("Failed to exec kcc on remote DC\n$cmd"); - return undef; - } - # as 'subdomain' dc may add data in its local replica # we need to synchronize data between DCs my $base_dn = "DC=".join(",DC=", split(/\./, $env->{REALM})); |