selftest: Move @exported_envvars into Samba.pm

This brings it closer to the code that actually sets these variables
(i.e. Samba3/4.pm).

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 bb2122d2a518f07d1dc9926fc840ca3d59b63077..773b28439d4b771b56397b4b39456b5694322f97 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -810,80 +810,6 @@ sub get_running_env($)
        return $running_envs{$envname};
 }
 
-my @exported_envvars = (
-       # domain stuff
-       "DOMAIN",
-       "DNSNAME",
-       "REALM",
-       "DOMSID",
-
-       # stuff related to a trusted domain
-       "TRUST_SERVER",
-       "TRUST_USERNAME",
-       "TRUST_PASSWORD",
-       "TRUST_DOMAIN",
-       "TRUST_REALM",
-       "TRUST_DOMSID",
-
-       # domain controller stuff
-       "DC_SERVER",
-       "DC_SERVER_IP",
-       "DC_SERVER_IPV6",
-       "DC_NETBIOSNAME",
-       "DC_NETBIOSALIAS",
-
-       # server stuff
-       "SERVER",
-       "SERVER_IP",
-       "SERVER_IPV6",
-       "NETBIOSNAME",
-       "NETBIOSALIAS",
-       "SAMSID",
-
-       # only use these 2 as a last resort. Some tests need to test both client-
-       # side and server-side. In this case, run as default client, ans access
-       # server's smb.conf as needed, typically using:
-       #  param.LoadParm(filename_for_non_global_lp=os.environ['SERVERCONFFILE'])
-       "SERVERCONFFILE",
-       "DC_SERVERCONFFILE",
-
-       # user stuff
-       "USERNAME",
-       "USERID",
-       "PASSWORD",
-       "DC_USERNAME",
-       "DC_PASSWORD",
-
-       # UID/GID for rfc2307 mapping tests
-       "UID_RFC2307TEST",
-       "GID_RFC2307TEST",
-
-       # misc stuff
-       "KRB5_CONFIG",
-       "KRB5CCNAME",
-       "SELFTEST_WINBINDD_SOCKET_DIR",
-       "NMBD_SOCKET_DIR",
-       "LOCAL_PATH",
-       "DNS_FORWARDER1",
-       "DNS_FORWARDER2",
-       "RESOLV_CONF",
-       "UNACCEPTABLE_PASSWORD",
-       "LOCK_DIR",
-       "SMBD_TEST_LOG",
-
-       # nss_wrapper
-       "NSS_WRAPPER_PASSWD",
-       "NSS_WRAPPER_GROUP",
-       "NSS_WRAPPER_HOSTS",
-       "NSS_WRAPPER_HOSTNAME",
-       "NSS_WRAPPER_MODULE_SO_PATH",
-       "NSS_WRAPPER_MODULE_FN_PREFIX",
-
-       # resolv_wrapper
-       "RESOLV_WRAPPER_CONF",
-       "RESOLV_WRAPPER_HOSTS",
-);
-
 sub sighandler($)
 {
        my $signame = shift;
@@ -920,9 +846,7 @@ sub setup_env($$)
        # Initially clear out the environment for the provision, so previous envs'
        # variables don't leak in. Provisioning steps must explicitly set their
        # necessary variables when calling out to other executables
-       foreach (@exported_envvars) {
-               delete $ENV{$_};
-       }
+       Samba::clear_exported_envvars();
        delete $ENV{SOCKET_WRAPPER_DEFAULT_IFACE};
        delete $ENV{SMB_CONF_PATH};
 
@@ -965,13 +889,8 @@ sub setup_env($$)
                die("Unknown option[$option] for envname[$envname]");
        }
 
-       foreach (@exported_envvars) {
-               if (defined($testenv_vars->{$_})) {
-                       $ENV{$_} = $testenv_vars->{$_};
-               } else {
-                       delete $ENV{$_};
-               }
-       }
+       # export the environment variables for the testenv (SERVER, SERVER_IP, etc)
+       Samba::export_envvars($testenv_vars);
 
        my $krb5_ccache_path = "${selftest_krbt_ccache_path}.${envname}.${option}";
        unlink($krb5_ccache_path);
@@ -979,19 +898,6 @@ sub setup_env($$)
        return $testenv_vars;
 }
 
-sub exported_envvars_str($)
-{
-       my ($testenv_vars) = @_;
-       my $out = "";
-
-       foreach (@exported_envvars) {
-               next unless defined($testenv_vars->{$_});
-               $out .= $_."=".$testenv_vars->{$_}."\n";
-       }
-
-       return $out;
-}
-
 sub getlog_env($)
 {
        my ($envname) = @_;
@@ -1040,7 +946,7 @@ if ($opt_testenv) {
        $ENV{PIDDIR} = $testenv_vars->{PIDDIR};
        $ENV{ENVNAME} = $testenv_name;
 
-       my $envvarstr = exported_envvars_str($testenv_vars);
+       my $envvarstr = Samba::exported_envvars_str($testenv_vars);
 
        my @term_args = ("echo -e \"
 Welcome to the Samba4 Test environment '$testenv_name'

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 324e1bfb90dd1f31cf43670216c2bc06bd4afc82..e13952c82567ce8ea3f580dad6423b2096b47aa0 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -532,4 +532,111 @@ sub random_domain_sid()
        return $domain_sid;
 }
 
+my @exported_envvars = (
+       # domain stuff
+       "DOMAIN",
+       "DNSNAME",
+       "REALM",
+       "DOMSID",
+
+       # stuff related to a trusted domain
+       "TRUST_SERVER",
+       "TRUST_USERNAME",
+       "TRUST_PASSWORD",
+       "TRUST_DOMAIN",
+       "TRUST_REALM",
+       "TRUST_DOMSID",
+
+       # domain controller stuff
+       "DC_SERVER",
+       "DC_SERVER_IP",
+       "DC_SERVER_IPV6",
+       "DC_NETBIOSNAME",
+       "DC_NETBIOSALIAS",
+
+       # server stuff
+       "SERVER",
+       "SERVER_IP",
+       "SERVER_IPV6",
+       "NETBIOSNAME",
+       "NETBIOSALIAS",
+       "SAMSID",
+
+       # only use these 2 as a last resort. Some tests need to test both client-
+       # side and server-side. In this case, run as default client, ans access
+       # server's smb.conf as needed, typically using:
+       #  param.LoadParm(filename_for_non_global_lp=os.environ['SERVERCONFFILE'])
+       "SERVERCONFFILE",
+       "DC_SERVERCONFFILE",
+
+       # user stuff
+       "USERNAME",
+       "USERID",
+       "PASSWORD",
+       "DC_USERNAME",
+       "DC_PASSWORD",
+
+       # UID/GID for rfc2307 mapping tests
+       "UID_RFC2307TEST",
+       "GID_RFC2307TEST",
+
+       # misc stuff
+       "KRB5_CONFIG",
+       "KRB5CCNAME",
+       "SELFTEST_WINBINDD_SOCKET_DIR",
+       "NMBD_SOCKET_DIR",
+       "LOCAL_PATH",
+       "DNS_FORWARDER1",
+       "DNS_FORWARDER2",
+       "RESOLV_CONF",
+       "UNACCEPTABLE_PASSWORD",
+       "LOCK_DIR",
+       "SMBD_TEST_LOG",
+
+       # nss_wrapper
+       "NSS_WRAPPER_PASSWD",
+       "NSS_WRAPPER_GROUP",
+       "NSS_WRAPPER_HOSTS",
+       "NSS_WRAPPER_HOSTNAME",
+       "NSS_WRAPPER_MODULE_SO_PATH",
+       "NSS_WRAPPER_MODULE_FN_PREFIX",
+
+       # resolv_wrapper
+       "RESOLV_WRAPPER_CONF",
+       "RESOLV_WRAPPER_HOSTS",
+);
+
+sub exported_envvars_str
+{
+       my ($testenv_vars) = @_;
+       my $out = "";
+
+       foreach (@exported_envvars) {
+               next unless defined($testenv_vars->{$_});
+               $out .= $_."=".$testenv_vars->{$_}."\n";
+       }
+
+       return $out;
+}
+
+sub clear_exported_envvars
+{
+       foreach (@exported_envvars) {
+               delete $ENV{$_};
+       }
+}
+
+sub export_envvars
+{
+       my ($testenv_vars) = @_;
+
+       foreach (@exported_envvars) {
+               if (defined($testenv_vars->{$_})) {
+                       $ENV{$_} = $testenv_vars->{$_};
+               } else {
+                       delete $ENV{$_};
+               }
+       }
+}
+
 1;