From 9dfd55c83aeafc6fdd76db87b03db6687e27e1f7 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Fri, 1 Jul 2016 17:02:50 +1200 Subject: kcc: Prevent the KCC from doing work on the RODC This should never have done any real work, new code or not. This just removes the initial KCC calls and bails out in the KCC if we actually ran it. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett --- selftest/target/Samba4.pm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'selftest') diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 64e1985ee37..b09bb662515 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -2283,31 +2283,8 @@ sub setup_rodc($$$) return undef; } - # force source and 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}\""; - $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; - $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\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 .= " $samba_tool drs kcc -k no $env->{SERVER}"; - $cmd .= " $env->{CONFIGURATION}"; - $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; - unless (system($cmd) == 0) { - warn("Failed to exec kcc\n$cmd"); - return undef; - } my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM})); $cmd = "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; -- cgit v1.2.1