diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-03-19 15:43:12 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-12-11 16:54:15 +0100 |
| commit | a32366e973c35ef08b890d30b0ac742820a92274 (patch) | |
| tree | 6bbe6112a2716d1f91f0b7f81e470eb73b2298f1 /selftest | |
| parent | c16afddeef2938e218df63b1c669caa5fb65d39c (diff) | |
| download | samba-a32366e973c35ef08b890d30b0ac742820a92274.tar.gz | |
selftest/Samba3: export ENVNAME
This is used by selftest/in_screen.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba3.pm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index e4a2417c6ac..e4adecb923d 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -166,7 +166,9 @@ sub check_env($$) sub setup_env($$$) { my ($self, $envname, $path) = @_; - + + $ENV{ENVNAME} = $envname; + if (defined($self->{vars}->{$envname})) { return $self->{vars}->{$envname}; } @@ -643,6 +645,8 @@ sub check_or_start($$$$$) { $ENV{UID_WRAPPER} = "1"; + $ENV{ENVNAME} = "$ENV{ENVNAME}.nmbd"; + if ($nmbd ne "yes") { $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { my $signame = shift; @@ -693,6 +697,8 @@ sub check_or_start($$$$$) { $ENV{UID_WRAPPER} = "1"; + $ENV{ENVNAME} = "$ENV{ENVNAME}.winbindd"; + if ($winbindd ne "yes") { $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { my $signame = shift; @@ -745,6 +751,8 @@ sub check_or_start($$$$$) { $ENV{UID_WRAPPER} = "1"; + $ENV{ENVNAME} = "$ENV{ENVNAME}.smbd"; + if ($smbd ne "yes") { $SIG{USR1} = $SIG{ALRM} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub { my $signame = shift; |