mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
selftest: Add common function to return cmd environment variables
We prefix samba-tool commands with a bunch of WRAPPER/CONF environment variables, in order for the command to work properly. These variables are duplicated all over the place in the selftest code. This patch adds a helper function to return the variables, so we can reduce the required code down to a single line in a lot of places. A couple of exceptions I've left alone: - drs replicate, which omits the RESOLV_WRAPPER_CONF/_HOSTS variables (I'm not sure whether that's deliberate or not). - create_backup(), which uses the backupfromdc's krb5.conf rather than the new testenv. Signed-off-by: Tim Beale <timbeale@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
parent
a87660b3c4
commit
8f9bb790bc
@ -475,6 +475,25 @@ sub get_dns_hub_env($)
|
||||
return undef;
|
||||
}
|
||||
|
||||
# Returns the environmental variables that we pass to samba-tool commands
|
||||
sub get_cmd_env_vars
|
||||
{
|
||||
my ($self, $localenv) = @_;
|
||||
|
||||
my $cmd_env = "NSS_WRAPPER_HOSTS='$localenv->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd_env .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$localenv->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($localenv->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd_env .= "RESOLV_WRAPPER_CONF=\"$localenv->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd_env .= "RESOLV_WRAPPER_HOSTS=\"$localenv->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd_env .= " KRB5_CONFIG=\"$localenv->{KRB5_CONFIG}\" ";
|
||||
$cmd_env .= "KRB5CCNAME=\"$localenv->{KRB5_CCACHE}\" ";
|
||||
$cmd_env .= "RESOLV_CONF=\"$localenv->{RESOLV_CONF}\" ";
|
||||
|
||||
return $cmd_env;
|
||||
}
|
||||
|
||||
sub setup_namespaces($$:$$)
|
||||
{
|
||||
my ($self, $localenv, $upn_array, $spn_array) = @_;
|
||||
@ -493,16 +512,7 @@ sub setup_namespaces($$:$$)
|
||||
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
|
||||
my $cmd_env = "NSS_WRAPPER_HOSTS='$localenv->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd_env .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$localenv->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($localenv->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd_env .= "RESOLV_WRAPPER_CONF=\"$localenv->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd_env .= "RESOLV_WRAPPER_HOSTS=\"$localenv->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd_env .= " KRB5_CONFIG=\"$localenv->{KRB5_CONFIG}\" ";
|
||||
$cmd_env .= "KRB5CCNAME=\"$localenv->{KRB5_CCACHE}\" ";
|
||||
$cmd_env .= "RESOLV_CONF=\"$localenv->{RESOLV_CONF}\" ";
|
||||
my $cmd_env = $self->get_cmd_env_vars($localenv);
|
||||
|
||||
my $cmd_config = " $localenv->{CONFIGURATION}";
|
||||
|
||||
@ -534,16 +544,7 @@ sub setup_trust($$$$$)
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
|
||||
# setup the trust
|
||||
my $cmd_env = "NSS_WRAPPER_HOSTS='$localenv->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd_env .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$localenv->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($localenv->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd_env .= "RESOLV_WRAPPER_CONF=\"$localenv->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd_env .= "RESOLV_WRAPPER_HOSTS=\"$localenv->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd_env .= " KRB5_CONFIG=\"$localenv->{KRB5_CONFIG}\" ";
|
||||
$cmd_env .= "KRB5CCNAME=\"$localenv->{KRB5_CCACHE}\" ";
|
||||
$cmd_env .= "RESOLV_CONF=\"$localenv->{RESOLV_CONF}\" ";
|
||||
my $cmd_env = $self->get_cmd_env_vars($localenv);
|
||||
|
||||
my $cmd_config = " $localenv->{CONFIGURATION}";
|
||||
my $cmd_creds = $cmd_config;
|
||||
@ -1307,16 +1308,7 @@ rpc_server:tcpip = no
|
||||
}
|
||||
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($ret->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
|
||||
$cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
|
||||
$cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($ret);
|
||||
$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member";
|
||||
$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
|
||||
$cmd .= " --machinepass=machine$ret->{PASSWORD}";
|
||||
@ -1390,16 +1382,7 @@ sub provision_rpc_proxy($$$)
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
|
||||
# The joind runs in the context of the rpc_proxy/member for now
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($ret->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
|
||||
$cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
|
||||
$cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($ret);
|
||||
$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member";
|
||||
$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
|
||||
$cmd .= " --machinepass=machine$ret->{PASSWORD}";
|
||||
@ -1496,16 +1479,7 @@ sub provision_promoted_dc($$$)
|
||||
}
|
||||
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($ret->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
|
||||
$cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
|
||||
$cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($ret);
|
||||
$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} MEMBER --realm=$dcvars->{REALM}";
|
||||
$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
|
||||
$cmd .= " --machinepass=machine$ret->{PASSWORD}";
|
||||
@ -1516,16 +1490,7 @@ sub provision_promoted_dc($$$)
|
||||
}
|
||||
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($ret->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
|
||||
$cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
|
||||
$cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($ret);
|
||||
$cmd .= "$samba_tool domain dcpromo $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
|
||||
$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
|
||||
$cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs --dns-backend=BIND9_DLZ";
|
||||
@ -1600,16 +1565,7 @@ sub provision_vampire_dc($$$)
|
||||
}
|
||||
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($ret->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
|
||||
$cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
|
||||
$cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($ret);
|
||||
$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
|
||||
$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} --domain-critical-only";
|
||||
$cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs";
|
||||
@ -1683,16 +1639,7 @@ sub provision_subdom_dc($$$)
|
||||
Samba::mk_mitkdc_conf($ctx, abs_path(Samba::bindir_path($self, "shared")));
|
||||
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($ret->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
|
||||
$cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
|
||||
$cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($ret);
|
||||
$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $ctx->{dnsname} subdomain ";
|
||||
$cmd .= "--parent-domain=$dcvars->{REALM} -U$dcvars->{DC_USERNAME}\@$dcvars->{REALM}\%$dcvars->{DC_PASSWORD}";
|
||||
$cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs";
|
||||
@ -1971,16 +1918,7 @@ sub provision_rodc($$$)
|
||||
}
|
||||
|
||||
my $samba_tool = Samba::bindir_path($self, "samba-tool");
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$ret->{NSS_WRAPPER_HOSTS}' ";
|
||||
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
|
||||
if (defined($ret->{RESOLV_WRAPPER_CONF})) {
|
||||
$cmd .= "RESOLV_WRAPPER_CONF=\"$ret->{RESOLV_WRAPPER_CONF}\" ";
|
||||
} else {
|
||||
$cmd .= "RESOLV_WRAPPER_HOSTS=\"$ret->{RESOLV_WRAPPER_HOSTS}\" ";
|
||||
}
|
||||
$cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
|
||||
$cmd .= "KRB5CCNAME=\"$ret->{KRB5_CCACHE}\" ";
|
||||
$cmd .= "RESOLV_CONF=\"$ret->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($ret);
|
||||
$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} RODC";
|
||||
$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
|
||||
$cmd .= " --server=$dcvars->{DC_SERVER} --use-ntvfs";
|
||||
@ -2560,16 +2498,7 @@ sub setup_generic_vampire_dc
|
||||
# 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}));
|
||||
my $cmd = "NSS_WRAPPER_HOSTS='$env->{NSS_WRAPPER_HOSTS}' ";
|
||||
$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 .= "RESOLV_CONF=\"$env->{RESOLV_CONF}\" ";
|
||||
my $cmd = $self->get_cmd_env_vars($env);
|
||||
$cmd .= " $samba_tool drs replicate $env->{DC_SERVER} $env->{SERVER}";
|
||||
$cmd .= " $dc_vars->{CONFIGURATION}";
|
||||
$cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
|
||||
@ -2588,16 +2517,7 @@ sub setup_generic_vampire_dc
|
||||
|
||||
# Pull in a full set of changes from the main DC
|
||||
my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM}));
|
||||
$cmd = "NSS_WRAPPER_HOSTS='$env->{NSS_WRAPPER_HOSTS}' ";
|
||||
$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 .= "RESOLV_CONF=\"$env->{RESOLV_CONF}\" ";
|
||||
$cmd = $self->get_cmd_env_vars($env);
|
||||
$cmd .= " $samba_tool drs replicate $env->{SERVER} $env->{DC_SERVER}";
|
||||
$cmd .= " $dc_vars->{CONFIGURATION}";
|
||||
$cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}";
|
||||
|
Loading…
Reference in New Issue
Block a user