From 30961641597d68e946d57ed7bd7214d2b1939b63 Mon Sep 17 00:00:00 2001 From: John Peacock Date: Fri, 15 Jul 2005 10:35:23 +0000 Subject: [PATCH] Support smtpgreeting file from qmail/control git-svn-id: https://svn.perl.org/qpsmtpd/trunk@508 958fd67b-6ff1-0310-b445-bb7760255be9 --- lib/Qpsmtpd/SMTP.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Qpsmtpd/SMTP.pm b/lib/Qpsmtpd/SMTP.pm index 2a6172b..98c72ed 100644 --- a/lib/Qpsmtpd/SMTP.pm +++ b/lib/Qpsmtpd/SMTP.pm @@ -114,8 +114,9 @@ sub connect_respond { return $rc; } elsif ($rc != DONE) { - $self->respond(220, $self->config('me') ." ESMTP qpsmtpd " - . $self->version ." ready; send us your mail, but not your spam."); + $self->respond(220, $self->config('smtpgreeting') ." ESMTP" || + ($self->config('me') ." ESMTP qpsmtpd " . $self->version . + " ready; send us your mail, but not your spam.")); return DONE; } } @@ -382,7 +383,8 @@ sub rcpt_respond { 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 .'); }