Use process_line instead of push_back_read which should be more efficient

git-svn-id: https://svn.perl.org/qpsmtpd/trunk@744 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2007-05-26 00:49:00 +00:00
parent 2d6bee1679
commit 784f02977d

View File

@ -36,7 +36,7 @@ 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 = 'smtpd'; # user to suid to my $USER = ''; # user to suid to
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 +76,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 } else { &help } if ($USER =~ /^([\w\-]+)$/) { $USER = $1 }
if ($PROCS =~ /^(\d+)$/) { $PROCS = $1 } else { &help } if ($PROCS =~ /^(\d+)$/) { $PROCS = $1 } else { &help }
sub force_poll { sub force_poll {
@ -192,6 +192,7 @@ 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";
@ -201,6 +202,7 @@ 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();
@ -292,7 +294,7 @@ sub _accept_handler {
return 1; return 1;
} }
$client->push_back_read("Connect\n"); $client->process_line("Connect\n");
$client->watch_read(1); $client->watch_read(1);
return 1; return 1;
} }