diff options
| -rwxr-xr-x | selftest/selftest.pl | 3 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 9478a2b39cf..c4eab453e96 100755 --- 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 d7b5177cc98..3188d7261cc 100755 --- 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") { |