selftest: Enable uid_wrapper globally.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 9478a2b39cf42d66f70f89aee68a6f657b69bc4d..c4eab453e96dad203e2578870835fc777d5bdf2a 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -353,6 +353,9 @@ if ($opt_libuid_wrapper_so_path) {
 $ENV{LD_PRELOAD} = $ld_preload;
 print "LD_PRELOAD=$ENV{LD_PRELOAD}\n";
 
+# Enable uid_wrapper globally
+$ENV{UID_WRAPPER} = 1;
+
 my $socket_wrapper_dir;
 if ($opt_socket_wrapper) {
        $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix_abs/w", $opt_socket_wrapper_pcap);

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index d7b5177cc982f2fe61d8997f8f97d7b9e374f995..3188d7261cc7a70740c70d147281c452a8f632c3 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -643,8 +643,6 @@ sub check_or_start($$$$$) {
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
 
-               $ENV{UID_WRAPPER} = "1";
-
                $ENV{ENVNAME} = "$ENV{ENVNAME}.nmbd";
 
                if ($nmbd ne "yes") {
@@ -700,8 +698,6 @@ sub check_or_start($$$$$) {
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
 
-               $ENV{UID_WRAPPER} = "1";
-
                $ENV{ENVNAME} = "$ENV{ENVNAME}.winbindd";
 
                if ($winbindd ne "yes") {
@@ -757,8 +753,6 @@ sub check_or_start($$$$$) {
                $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP};
                $ENV{NSS_WRAPPER_WINBIND_SO_PATH} = $env_vars->{NSS_WRAPPER_WINBIND_SO_PATH};
 
-               $ENV{UID_WRAPPER} = "1";
-
                $ENV{ENVNAME} = "$ENV{ENVNAME}.smbd";
 
                if ($smbd ne "yes") {