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>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index b7fb2d841ac43e1c730a12348c8cf2795016f2fb..3ee4abfd05f54f323440fb547f7918f5f9e2ea4f 100755 (executable)
--- 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",

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index d73ac1eab1a66bdd9cef488e0949ffd36cc3cf38..4446cadb5e7b66782376ff07c53098a1441a3130 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -532,9 +532,7 @@ sub setup_trust($$$$$)
        my ($self, $localenv, $remoteenv, $type, $extra_args) = @_;
 
        $localenv->{TRUST_SERVER} = $remoteenv->{SERVER};
-       $localenv->{TRUST_SERVER_IP} = $remoteenv->{SERVER_IP};
-       $localenv->{TRUST_SERVER_IPV6} = $remoteenv->{SERVER_IPV6};
-       $localenv->{TRUST_NETBIOSNAME} = $remoteenv->{NETBIOSNAME};
+
        $localenv->{TRUST_USERNAME} = $remoteenv->{USERNAME};
        $localenv->{TRUST_PASSWORD} = $remoteenv->{PASSWORD};
        $localenv->{TRUST_DOMAIN} = $remoteenv->{DOMAIN};
@@ -1318,13 +1316,6 @@ rpc_server:tcpip = no
                return undef;
        }
 
-       $ret->{MEMBER_SERVER} = $ret->{SERVER};
-       $ret->{MEMBER_SERVER_IP} = $ret->{SERVER_IP};
-       $ret->{MEMBER_SERVER_IPV6} = $ret->{SERVER_IPV6};
-       $ret->{MEMBER_NETBIOSNAME} = $ret->{NETBIOSNAME};
-       $ret->{MEMBER_USERNAME} = $ret->{USERNAME};
-       $ret->{MEMBER_PASSWORD} = $ret->{PASSWORD};
-
        $ret->{DOMSID} = $dcvars->{DOMSID};
        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
@@ -1422,13 +1413,6 @@ sub provision_rpc_proxy($$$)
                return undef;
        }
 
-       $ret->{RPC_PROXY_SERVER} = $ret->{SERVER};
-       $ret->{RPC_PROXY_SERVER_IP} = $ret->{SERVER_IP};
-       $ret->{RPC_PROXY_SERVER_IPV6} = $ret->{SERVER_IPV6};
-       $ret->{RPC_PROXY_NETBIOSNAME} = $ret->{NETBIOSNAME};
-       $ret->{RPC_PROXY_USERNAME} = $ret->{USERNAME};
-       $ret->{RPC_PROXY_PASSWORD} = $ret->{PASSWORD};
-
        $ret->{DOMSID} = $dcvars->{DOMSID};
        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
@@ -1502,11 +1486,6 @@ sub provision_promoted_dc($$$)
                return undef;
        }
 
-       $ret->{PROMOTED_DC_SERVER} = $ret->{SERVER};
-       $ret->{PROMOTED_DC_SERVER_IP} = $ret->{SERVER_IP};
-       $ret->{PROMOTED_DC_SERVER_IPV6} = $ret->{SERVER_IPV6};
-       $ret->{PROMOTED_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
-
        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
        $ret->{DC_SERVER_IPV6} = $dcvars->{DC_SERVER_IPV6};
@@ -1579,17 +1558,6 @@ sub provision_vampire_dc($$$)
                return undef;
        }
 
-        if ($fl == "2000") {
-               $ret->{VAMPIRE_2000_DC_SERVER} = $ret->{SERVER};
-               $ret->{VAMPIRE_2000_DC_SERVER_IP} = $ret->{SERVER_IP};
-               $ret->{VAMPIRE_2000_DC_SERVER_IPV6} = $ret->{SERVER_IPV6};
-               $ret->{VAMPIRE_2000_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
-        } else {
-               $ret->{VAMPIRE_DC_SERVER} = $ret->{SERVER};
-               $ret->{VAMPIRE_DC_SERVER_IP} = $ret->{SERVER_IP};
-               $ret->{VAMPIRE_DC_SERVER_IPV6} = $ret->{SERVER_IPV6};
-               $ret->{VAMPIRE_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
-        }
        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
        $ret->{DC_SERVER_IPV6} = $dcvars->{DC_SERVER_IPV6};
@@ -1655,9 +1623,6 @@ sub provision_subdom_dc($$$)
        }
 
        $ret->{SUBDOM_DC_SERVER} = $ret->{SERVER};
-       $ret->{SUBDOM_DC_SERVER_IP} = $ret->{SERVER_IP};
-       $ret->{SUBDOM_DC_SERVER_IPV6} = $ret->{SERVER_IPV6};
-       $ret->{SUBDOM_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
 
        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};
@@ -1956,9 +1921,6 @@ sub provision_rodc($$$)
        Samba::mk_mitkdc_conf($ctx, abs_path(Samba::bindir_path($self, "shared")));
 
        $ret->{RODC_DC_SERVER} = $ret->{SERVER};
-       $ret->{RODC_DC_SERVER_IP} = $ret->{SERVER_IP};
-       $ret->{RODC_DC_SERVER_IPV6} = $ret->{SERVER_IPV6};
-       $ret->{RODC_DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
 
        $ret->{DC_SERVER} = $dcvars->{DC_SERVER};
        $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP};

diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
index d6e7947c6d79a8a03d3a9528693b6a6ac58469ba..50584a16772ef906ed45afb33143aa29aeb15cc2 100644 (file)
--- a/source4/scripting/devel/selftest-vars.sh
+++ b/source4/scripting/devel/selftest-vars.sh
@@ -5,18 +5,6 @@ export UID_WRAPPER=1
 export NSS_WRAPPER_PASSWD=$PWD/st/ad_dc_ntvfs/passwd
 export NSS_WRAPPER_GROUP=$PWD/st/ad_dc_ntvfs/group
 export CONFIGURATION="--configfile=$PWD/st/ad_dc_ntvfs/etc/smb.conf"
-export VAMPIRE_DC_SERVER=localvampiredc
-export VAMPIRE_DC_SERVER_IP=127.0.0.22
-export VAMPIRE_DC_NETBIOSNAME=localvampiredc1
-export VAMPIRE_DC_NETBIOSALIAS=localvampiredc
-export MEMBER_SERVER=localmember3
-export MEMBER_SERVER_IP=127.0.0.23
-export MEMBER_NETBIOSNAME=localmember3
-export MEMBER_NETBIOSALIAS=localmember
-export RPC_PROXY_SERVER=localrpcproxy4
-export RPC_PROXY_SERVER_IP=127.0.0.24
-export RPC_PROXY_NETBIOSNAME=localrpcproxy4
-export RPC_PROXY_NETBIOSALIAS=localrpcproxy
 export SELFTEST_MAXTIME=1200
 export NETBIOSNAME=localdc1
 export REALM=SAMBA.EXAMPLE.COM