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

[merge from trunk] Use qmail/control/smtpdgreeting if it exists, otherwise

Browse Source 
show the original qpsmtpd greeting (with version information).

git-svn-id: https://svn.perl.org/qpsmtpd/branches/0.31@518 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
John Peacock 2005-07-19 14:20:05 +00:00
parent 820a3bcb2b
commit 58f7129ada
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Qpsmtpd/SMTP.pm
View File

@ -104,8 +104,18 @@ sub start_conversation {
return $rc;
}
elsif ($rc != DONE) {
$self->respond(220, $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;
}
}
@ -347,7 +357,8 @@ sub rcpt {
sub help {
my $self = shift;
$self->respond(214,
"This is qpsmtpd " . $self->version,
"This is qpsmtpd " .
$self->config('smtpgreeting') ? '' : $self->version,
"See http://smtpd.develooper.com/",
'To report bugs or send comments, mail to <ask@develooper.com>.');
}