[svn:qpsmtpd] r539 - trunk/lib

Author: aqua
Date: Sun Jul 31 01:48:04 2005
New Revision: 539

Modified:
   trunk/lib/Qpsmtpd.pm
Log:
Merge r529 from 0.31 branch (explicit config dir via $QPSMTPD_CONFIG).


Modified: trunk/lib/Qpsmtpd.pm
==============================================================================
--- trunk/lib/Qpsmtpd.pm	(original)
+++ trunk/lib/Qpsmtpd.pm	Sun Jul 31 01:48:04 2005
@@ -116,6 +116,10 @@ sub config_dir {
   my $configdir = ($ENV{QMAIL} || '/var/qmail') . '/control';
   my ($name) = ($0 =~ m!(.*?)/([^/]+)$!);
   $configdir = "$name/config" if (-e "$name/config/$config");
+  if (exists $ENV{QPSMTPD_CONFIG}) {
+    $ENV{QPSMTPD_CONFIG} =~ /^(.*)$/; # detaint
+    $configdir = $1 if -e "$1/$config";
+  }
   return $configdir;
 }