From 5dd89ed5aab002b842a94ac8af443ccf19db984d Mon Sep 17 00:00:00 2001 From: Bob Campbell Date: Tue, 10 Jan 2017 09:20:47 +1300 Subject: [PATCH 1/2] 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. Signed-off-by: Bob Campbell Reviewed-by: Andrew Bartlett --- selftest/target/Samba4.pm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index ea81d7d..26ebf17 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}\" "; -- 2.9.4 From fd496eff667f4e6670d39e9ad04cd0cd50ce2478 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 30 Jun 2017 13:42:50 +1200 Subject: [PATCH 2/2] selftest: No longer run the KCC at startup This just raced against the KCC run internally and caused spurious environment startup failures Signed-off-by: Andrew Bartlett --- selftest/target/Samba4.pm | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 26ebf17..7d9fe3c 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -2366,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})); @@ -2433,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})); -- 2.9.4