[svn:qpsmtpd] r745 - trunk

[msergeant]

Author: msergeant
Date: Sat May 26 16:38:09 2007
New Revision: 745

Modified:
   trunk/qpsmtpd-async

Log:
Fix dropping privileges code to be same as forkserver


Modified: trunk/qpsmtpd-async
==============================================================================
--- trunk/qpsmtpd-async (original)
+++ trunk/qpsmtpd-async Sat May 26 16:38:09 2007
@@ -36,7 +36,8 @@
 my $PORT        = 2525;
 my $LOCALADDR   = '0.0.0.0';
 my $PROCS       = 1;
-my $USER        = '';      # user to suid to
+my $USER        = (getpwuid $>)[0];         # user to suid to
+   $USER        = "smtpd" if $USER eq "root";
 my $PAUSED      = 0;
 my $NUMACCEPT   = 20;
 my $ACCEPT_RSET = Danga::Socket->AddTimer(30, \&reset_num_accept);
@@ -76,7 +77,7 @@
 # detaint the commandline
 if ($PORT =~ /^(\d+)$/) { $PORT = $1 } else { &help }
 if ($LOCALADDR =~ /^([\d\w\-.]+)$/) { $LOCALADDR = $1 } else { &help }
-if ($USER =~ /^([\w\-]+)$/) { $USER = $1 }
+if ($USER =~ /^([\w\-]+)$/) { $USER = $1 } else { &help }
 if ($PROCS =~ /^(\d+)$/) { $PROCS = $1 } else { &help }
 
 sub force_poll {
@@ -192,17 +193,15 @@
     IO::Handle::blocking($CONFIG_SERVER, 0);
     binmode($CONFIG_SERVER, ':raw');
 
-    if ($USER) {
-        # Drop priviledges
-        my (undef, undef, $quid, $qgid) = getpwnam $USER or
-              die "unable to determine uid/gid for $USER\n";
-        $) = "";
-        POSIX::setgid($qgid) or
-              die "unable to change gid: $!\n";
-        POSIX::setuid($quid) or
-              die "unable to change uid: $!\n";
-        $> = $quid;
-    }
+    # Drop priviledges
+    my (undef, undef, $quid, $qgid) = getpwnam $USER or
+          die "unable to determine uid/gid for $USER\n";
+    $) = "";
+    POSIX::setgid($qgid) or
+          die "unable to change gid: $!\n";
+    POSIX::setuid($quid) or
+          die "unable to change uid: $!\n";
+    $> = $quid;
     
     # Load plugins here
     my $plugin_loader = Qpsmtpd::SMTP->new();