51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
|
diff -ru DBI-1.46/dbiproxy.PL DBI-1.46-secfix/dbiproxy.PL
|
||
|
|
--- DBI-1.46/dbiproxy.PL 2004-02-02 14:04:42.000000000 +0100
|
||
|
|
+++ DBI-1.46-secfix/dbiproxy.PL 2006-03-03 09:32:28.000000000 +0100
|
||
|
|
@@ -146,7 +146,7 @@
|
||
|
|
=item B<--pidfile=file>
|
||
|
|
|
||
|
|
(UNIX only) If this option is present, a PID file will be created at the
|
||
|
|
-given location.
|
||
|
|
+given location. Default is do not create a pidfile.
|
||
|
|
|
||
|
|
=item B<--user=uid>
|
||
|
|
|
||
|
|
diff -ru DBI-1.46/lib/DBI/ProxyServer.pm DBI-1.46-secfix/lib/DBI/ProxyServer.pm
|
||
|
|
--- DBI-1.46/lib/DBI/ProxyServer.pm 2003-05-14 13:10:55.000000000 +0200
|
||
|
|
+++ DBI-1.46-secfix/lib/DBI/ProxyServer.pm 2006-03-03 09:31:42.000000000 +0100
|
||
|
|
@@ -32,15 +32,6 @@
|
||
|
|
|
||
|
|
package DBI::ProxyServer;
|
||
|
|
|
||
|
|
-
|
||
|
|
-my $haveFileSpec = eval { require File::Spec };
|
||
|
|
-my $tmpDir = $haveFileSpec ? File::Spec->tmpdir() :
|
||
|
|
- ($ENV{'TMP'} || $ENV{'TEMP'} || '/tmp');
|
||
|
|
-my $defaultPidFile = $haveFileSpec ?
|
||
|
|
- File::Spec->catdir($tmpDir, "dbiproxy.pid") : "/tmp/dbiproxy.pid";
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-############################################################################
|
||
|
|
#
|
||
|
|
# Constants
|
||
|
|
#
|
||
|
|
@@ -109,7 +100,8 @@
|
||
|
|
} else {
|
||
|
|
$o->{'mode'} = 'single';
|
||
|
|
}
|
||
|
|
- $o->{'pidfile'} = $defaultPidFile;
|
||
|
|
+ # No pidfile by default, configuration must provide one if needed
|
||
|
|
+ $o->{'pidfile'} = 'none';
|
||
|
|
$o->{'user'} = undef;
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -520,7 +512,7 @@
|
||
|
|
=item I<pidfile> (B<--pidfile=file>)
|
||
|
|
|
||
|
|
(UNIX only) If this option is present, a PID file will be created at the
|
||
|
|
-given location.
|
||
|
|
+given location. Default is do not create a pidfile.
|
||
|
|
|
||
|
|
=item I<user> (B<--user=uid>)
|
||
|
|
|