Fix dropping privileges code to be same as forkserver
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@745 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
784f02977d
commit
8b5488dd77
@ -36,7 +36,8 @@ my $CONFIG_LOCALADDR = '127.0.0.1';
|
|||||||
my $PORT = 2525;
|
my $PORT = 2525;
|
||||||
my $LOCALADDR = '0.0.0.0';
|
my $LOCALADDR = '0.0.0.0';
|
||||||
my $PROCS = 1;
|
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 $PAUSED = 0;
|
||||||
my $NUMACCEPT = 20;
|
my $NUMACCEPT = 20;
|
||||||
my $ACCEPT_RSET = Danga::Socket->AddTimer(30, \&reset_num_accept);
|
my $ACCEPT_RSET = Danga::Socket->AddTimer(30, \&reset_num_accept);
|
||||||
@ -76,7 +77,7 @@ GetOptions(
|
|||||||
# detaint the commandline
|
# detaint the commandline
|
||||||
if ($PORT =~ /^(\d+)$/) { $PORT = $1 } else { &help }
|
if ($PORT =~ /^(\d+)$/) { $PORT = $1 } else { &help }
|
||||||
if ($LOCALADDR =~ /^([\d\w\-.]+)$/) { $LOCALADDR = $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 }
|
if ($PROCS =~ /^(\d+)$/) { $PROCS = $1 } else { &help }
|
||||||
|
|
||||||
sub force_poll {
|
sub force_poll {
|
||||||
@ -192,7 +193,6 @@ sub run_as_server {
|
|||||||
IO::Handle::blocking($CONFIG_SERVER, 0);
|
IO::Handle::blocking($CONFIG_SERVER, 0);
|
||||||
binmode($CONFIG_SERVER, ':raw');
|
binmode($CONFIG_SERVER, ':raw');
|
||||||
|
|
||||||
if ($USER) {
|
|
||||||
# Drop priviledges
|
# Drop priviledges
|
||||||
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";
|
||||||
@ -202,7 +202,6 @@ sub run_as_server {
|
|||||||
POSIX::setuid($quid) or
|
POSIX::setuid($quid) or
|
||||||
die "unable to change uid: $!\n";
|
die "unable to change uid: $!\n";
|
||||||
$> = $quid;
|
$> = $quid;
|
||||||
}
|
|
||||||
|
|
||||||
# Load plugins here
|
# Load plugins here
|
||||||
my $plugin_loader = Qpsmtpd::SMTP->new();
|
my $plugin_loader = Qpsmtpd::SMTP->new();
|
||||||
|
Loading…
Reference in New Issue
Block a user