[svn:qpsmtpd] rev 508 - trunk/lib/Qpsmtpd

Author: jpeacock
Date: Fri Jul 15 03:35:23 2005
New Revision: 508

Modified:
   trunk/lib/Qpsmtpd/SMTP.pm
Log:
Support smtpgreeting file from qmail/control

Modified: trunk/lib/Qpsmtpd/SMTP.pm
==============================================================================
--- trunk/lib/Qpsmtpd/SMTP.pm	(original)
+++ trunk/lib/Qpsmtpd/SMTP.pm	Fri Jul 15 03:35:23 2005
@@ -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 <[email protected]>.');
 }