svn commit: samba r21790 - in
branches/SAMBA_4_0/source/script/tests: .
abartlet at samba.org
abartlet at samba.org
Mon Mar 12 00:24:04 GMT 2007
Author: abartlet
Date: 2007-03-12 00:24:03 +0000 (Mon, 12 Mar 2007)
New Revision: 21790
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21790
Log:
Setup the socket_wrapper_dir when we set the environment variable.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/script/tests/Samba4.pm
branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-03-12 00:16:24 UTC (rev 21789)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-03-12 00:24:03 UTC (rev 21790)
@@ -58,14 +58,6 @@
warn("Not using socket wrapper, but also not running as root. Will not be able to listen on proper ports") unless
defined($socket_wrapper_dir) or $< == 0;
- if (defined($socket_wrapper_dir)) {
- if ( -d $socket_wrapper_dir ) {
- unlink <$socket_wrapper_dir/*>;
- } else {
- mkdir($socket_wrapper_dir);
- }
- }
-
unlink($test_fifo);
POSIX::mkfifo($test_fifo, 0700);
unlink($test_log);
Modified: branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm 2007-03-12 00:16:24 UTC (rev 21789)
+++ branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm 2007-03-12 00:24:03 UTC (rev 21790)
@@ -15,6 +15,14 @@
sub setup_dir($)
{
my ($dir) = @_;
+ if (defined($dir)) {
+ if ( -d $dir ) {
+ unlink <$dir/*>;
+ } else {
+ mkdir($dir);
+ }
+ }
+
$ENV{SOCKET_WRAPPER_DIR} = $dir;
return $dir;
}
More information about the samba-cvs
mailing list