git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
54bfc1d
)
r22374: fix perl warnings
author
Stefan Metzmacher
<metze@samba.org>
Thu, 19 Apr 2007 14:51:46 +0000
(14:51 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 19:51:09 +0000
(14:51 -0500)
metze
source/script/tests/SocketWrapper.pm
patch
|
blob
|
history
diff --git
a/source/script/tests/SocketWrapper.pm
b/source/script/tests/SocketWrapper.pm
index 17c445714639a796d92c42183485ca2388ca4eb8..aa913d240e49ec4d42cca75bc89427ec2e30682c 100644
(file)
--- a/
source/script/tests/SocketWrapper.pm
+++ b/
source/script/tests/SocketWrapper.pm
@@
-35,8
+35,18
@@
sub setup_dir($$)
}
}
- $ENV{SOCKET_WRAPPER_PCAP_DIR} = $pcap_dir;
- $ENV{SOCKET_WRAPPER_DIR} = $dir;
+ if (defined($pcap_dir)) {
+ $ENV{SOCKET_WRAPPER_PCAP_DIR} = $pcap_dir;
+ } else {
+ delete $ENV{SOCKET_WRAPPER_PCAP_DIR};
+ }
+
+ if (defined($dir)) {
+ $ENV{SOCKET_WRAPPER_DIR} = $dir;
+ } else {
+ delete $ENV{SOCKET_WRAPPER_DIR};
+ }
+
return $dir;
}