sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

selftest: Enable uid_wrapper globally.

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider 2014-04-03 10:42:30 +02:00 committed by Stefan Metzmacher
parent 9feeeb369b
commit d1c53ebf4c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
selftest/selftest.pl
View File

@ -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);

6
selftest/target/Samba3.pm
View File

@ -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") {