byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ qpsmtpd-forkserver: add an option for writing a PID file (pjh)

Browse Source 
+
+  qpsmtpd-forkserver: set auxiliary groups (this is needed for the
+  postfix backend, which expects to have write permission to a fifo
+  which usually belongs to group postdrop). (pjh)



git-svn-id: https://svn.perl.org/qpsmtpd/trunk@460 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Ask Bjørn Hansen 2005-07-04 14:44:51 +00:00
parent df5a2e9d95
commit 03f8c0d2f8
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@ -1,5 +1,11 @@
0.31 - 0.31 -
qpsmtpd-forkserver: add an option for writing a PID file (pjh)
qpsmtpd-forkserver: set auxiliary groups (this is needed for the
postfix backend, which expects to have write permission to a fifo
which usually belongs to group postdrop). (pjh)
when disconncting with a temporary failure, return 421 rather than when disconncting with a temporary failure, return 421 rather than
450 or 451. (Peter J. Holzer) 450 or 451. (Peter J. Holzer)

38
qpsmtpd-forkserver
View File

@ -22,6 +22,7 @@ my $PORT = 2525; # port number
my $LOCALADDR = '0.0.0.0'; # ip address to bind to my $LOCALADDR = '0.0.0.0'; # ip address to bind to
my $USER = 'smtpd'; # user to suid to my $USER = 'smtpd'; # user to suid to
my $MAXCONNIP = 5; # max simultaneous connections from one IP my $MAXCONNIP = 5; # max simultaneous connections from one IP
my $PID_FILE = '/var/run/qpsmtpd.pid';
sub usage { sub usage {
print <<"EOT"; print <<"EOT";
@ -31,6 +32,7 @@ usage: qpsmtpd-forkserver [ options ]
-c, --limit-connections N : limit concurrent connections to N; default 15 -c, --limit-connections N : limit concurrent connections to N; default 15
-u, --user U : run as a particular user (default 'smtpd') -u, --user U : run as a particular user (default 'smtpd')
-m, --max-from-ip M : limit connections from a single IP; default 5 -m, --max-from-ip M : limit connections from a single IP; default 5
--pid-file P : print main servers PID to file P
EOT EOT
exit 0; exit 0;
} }
@ -40,13 +42,16 @@ GetOptions('h|help' => \&usage,
'c|limit-connections=i' => \$MAXCONN, 'c|limit-connections=i' => \$MAXCONN,
'm|max-from-ip=i' => \$MAXCONNIP, 'm|max-from-ip=i' => \$MAXCONNIP,
'p|port=i' => \$PORT, 'p|port=i' => \$PORT,
'u|user=s' => \$USER) || &usage; 'u|user=s' => \$USER,
'pid-file=s' => \$PID_FILE,
) || &usage;
# detaint the commandline # detaint the commandline
if ($PORT =~ /^(\d+)$/) { $PORT = $1 } else { &usage } if ($PORT =~ /^(\d+)$/) { $PORT = $1 } else { &usage }
if ($LOCALADDR =~ /^([\d\w\-.]+)$/) { $LOCALADDR = $1 } else { &usage } if ($LOCALADDR =~ /^([\d\w\-.]+)$/) { $LOCALADDR = $1 } else { &usage }
if ($USER =~ /^([\w\-]+)$/) { $USER = $1 } else { &usage } if ($USER =~ /^([\w\-]+)$/) { $USER = $1 } else { &usage }
if ($MAXCONN =~ /^(\d+)$/) { $MAXCONN = $1 } else { &usage } if ($MAXCONN =~ /^(\d+)$/) { $MAXCONN = $1 } else { &usage }
if ($PID_FILE =~ m#^(/[\w\d/\-.]+)$#) { $PID_FILE = $1 } else { &usage }
delete $ENV{ENV}; delete $ENV{ENV};
$ENV{PATH} = '/bin:/usr/bin:/var/qmail/bin'; $ENV{PATH} = '/bin:/usr/bin:/var/qmail/bin';
@ -80,10 +85,37 @@ my $server = IO::Socket::INET->new(LocalPort => $PORT,
Listen => SOMAXCONN ) Listen => SOMAXCONN )
or die "Creating TCP socket $LOCALADDR:$PORT: $!\n"; or die "Creating TCP socket $LOCALADDR:$PORT: $!\n";
# Drop priviledges if (-e $PID_FILE) {
open PID, "+<$PID_FILE"
or die "open pid_file: $!\n";
my $running_pid = <PID>; chomp $running_pid;
if ($running_pid =~ /(\d+)/) {
$running_pid = $1;
if (kill 0, $running_pid) {
die "Found an already running qpsmtpd with pid $running_pid.\n";
}
}
seek PID, 0, 0
or die "Could not seek back to beginning of $PID_FILE: $!\n";
} else {
open PID, ">$PID_FILE"
or die "open pid_file: $!\n";
}
print PID $$,"\n";
close PID;
# Drop privileges
my (undef, undef, $quid, $qgid) = getpwnam $USER or my (undef, undef, $quid, $qgid) = getpwnam $USER or
die "unable to determine uid/gid for $USER\n"; die "unable to determine uid/gid for $USER\n";
$) = ""; my $groups = "$qgid $qgid";
while (my ($name,$passwd,$gid,$members) = getgrent()) {
my @m = split(/ /, $members);
if (grep {$_ eq $USER} @m) {
::log(LOGINFO,"$USER is member of group $name($gid)");
$groups .= " $gid";
}
}
$) = $groups;
POSIX::setgid($qgid) or POSIX::setgid($qgid) or
die "unable to change gid: $!\n"; die "unable to change gid: $!\n";
POSIX::setuid($quid) or POSIX::setuid($quid) or