Jim Winstead wrote:
$self->respond(220, $self->config('smtpgreeting') ." ESMTP" ||
($self->config('me') ." ESMTP qpsmtpd " . $self->version .
" ready; send us your mail, but not your spam."));
this means it sends " ESMTP" if you don't have a smtpgreeting config.
Indeed, that was stupid. I just committed this:
=== lib/Qpsmtpd/SMTP.pm
==================================================================
--- lib/Qpsmtpd/SMTP.pm (revision 613)
+++ lib/Qpsmtpd/SMTP.pm (local)
@@ -114,9 +114,18 @@
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;
}
}
and this time I even tested it... :-0
John
