selftest/Samba3: export ENVNAME
authorStefan Metzmacher <metze@samba.org>
Tue, 19 Mar 2013 14:43:12 +0000 (15:43 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 11 Dec 2013 15:54:15 +0000 (16:54 +0100)
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>
selftest/target/Samba3.pm

index e4a2417c6ac6711590d5655eb1a0f64e639441e4..e4adecb923d171cb305ad3abcb63fcd30a705a10 100755 (executable)
@@ -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;