Correctly handle the case where smtpgreeting exists (append ESMTP) as well as
the case where it doesn't (display original Qpsmtpd greeting). git-svn-id: https://svn.perl.org/qpsmtpd/trunk@511 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
parent
e8a9828e4e
commit
43aef48532
@ -114,9 +114,18 @@ sub connect_respond {
|
||||
return $rc;
|
||||
}
|
||||
elsif ($rc != DONE) {
|
||||
$self->respond(220, $self->config('smtpgreeting') ." ESMTP" ||
|
||||
($self->config('me') ." ESMTP qpsmtpd " . $self->version .
|
||||
" ready; send us your mail, but not your spam."));
|
||||
my $greets = $self->config('smtpgreeting');
|
||||
if ( $greets ) {
|
||||
$greets .= " ESMTP";
|
||||
}
|
||||
else {
|
||||
$greets = $self->config('me')
|
||||
. " ESMTP qpsmtpd "
|
||||
. $self->version
|
||||
. " ready; send us your mail, but not your spam.";
|
||||
}
|
||||
|
||||
$self->respond(220, $greets);
|
||||
return DONE;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user