diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2019-02-13 14:50:12 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-18 05:42:09 +0100 |
| commit | b348045955b728e88d3d261dff9996f07f01f2bb (patch) | |
| tree | 6cb88e049b0e2ed08c9de9f5f52c9f59001b1e01 /selftest/selftest.pl | |
| parent | ab37446230c50a71dac7e7e00baf6cbfe937f60a (diff) | |
| download | samba-b348045955b728e88d3d261dff9996f07f01f2bb.tar.gz | |
selftest: Remove unused environment variables
We only really want generic environment variables. For 2+ DC
environments, we have the $SERVER and $DC_SERVER (aka PDC) variables.
However, lots of testenvs also export really specific environment
variables, e.g. VAMPIRE_2000_DC_SERVER_IP (despite that testenv being
only used for a single test case).
Previously the <testenv>_SERVER variable was used for DRS tests, but we
can avoid the need to do this now. The other variables are not used at
all.
The RODC and TRUST environment variables are still used by a few tests.
SUBDOM_DC_SERVER is only used within Samba4.pm and not exported.
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/selftest.pl')
| -rwxr-xr-x | selftest/selftest.pl | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index b7fb2d841ac..3ee4abfd05f 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -821,9 +821,6 @@ my @exported_envvars = ( # stuff related to a trusted domain "TRUST_SERVER", - "TRUST_SERVER_IP", - "TRUST_SERVER_IPV6", - "TRUST_NETBIOSNAME", "TRUST_USERNAME", "TRUST_PASSWORD", "TRUST_DOMAIN", @@ -837,45 +834,8 @@ my @exported_envvars = ( "DC_NETBIOSNAME", "DC_NETBIOSALIAS", - # domain member - "MEMBER_SERVER", - "MEMBER_SERVER_IP", - "MEMBER_SERVER_IPV6", - "MEMBER_NETBIOSNAME", - "MEMBER_NETBIOSALIAS", - - # rpc proxy controller stuff - "RPC_PROXY_SERVER", - "RPC_PROXY_SERVER_IP", - "RPC_PROXY_SERVER_IPV6", - "RPC_PROXY_NETBIOSNAME", - "RPC_PROXY_NETBIOSALIAS", - - # domain controller stuff for Vampired DC - "VAMPIRE_DC_SERVER", - "VAMPIRE_DC_SERVER_IP", - "VAMPIRE_DC_SERVER_IPV6", - "VAMPIRE_DC_NETBIOSNAME", - "VAMPIRE_DC_NETBIOSALIAS", - # domain controller stuff for RODC "RODC_DC_SERVER", - "RODC_DC_SERVER_IP", - "RODC_DC_SERVER_IPV6", - "RODC_DC_NETBIOSNAME", - - # domain controller stuff for FL 2000 Vampired DC - "VAMPIRE_2000_DC_SERVER", - "VAMPIRE_2000_DC_SERVER_IP", - "VAMPIRE_2000_DC_SERVER_IPV6", - "VAMPIRE_2000_DC_NETBIOSNAME", - "VAMPIRE_2000_DC_NETBIOSALIAS", - - "PROMOTED_DC_SERVER", - "PROMOTED_DC_SERVER_IP", - "PROMOTED_DC_SERVER_IPV6", - "PROMOTED_DC_NETBIOSNAME", - "PROMOTED_DC_NETBIOSALIAS", # server stuff "SERVER", |