cvs commit: qpsmtpd Changes

cvsuser     03/04/16 09:45:57

  Modified:    plugins/queue qmail-queue
               .        Changes
  Log:
  Have the qmail-queue plugin add the message-id to the "Queued!"
  message we send back to the client (to help those odd sendmail using
  people debug their logs)
  
  Revision  Changes    Path
  1.3       +4 -1      qpsmtpd/plugins/queue/qmail-queue
  
  Index: qmail-queue
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/plugins/queue/qmail-queue,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- qmail-queue	20 Jan 2003 11:01:32 -0000	1.2
  +++ qmail-queue	16 Apr 2003 16:45:57 -0000	1.3
  @@ -70,7 +70,10 @@
       waitpid($child, 0);
       my $exit_code = $? >> 8;
       $exit_code and return(DECLINED, "Unable to queue message ($exit_code)");
  -    return (OK, "Queued!");
  +
  +    my $msg_id = $transaction->header->get('Message-Id') || '';
  +    $msg_id =~ s/[\r\n].*//s;  # don't allow newlines in the Message-Id here
  +    return (OK, "Queued! $msg_id");
     }
     elsif (defined $child) {
       # Child
  
  
  
  1.41      +4 -0      qpsmtpd/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /cvs/public/qpsmtpd/Changes,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -w -r1.40 -r1.41
  --- Changes	16 Apr 2003 16:35:14 -0000	1.40
  +++ Changes	16 Apr 2003 16:45:57 -0000	1.41
  @@ -1,5 +1,9 @@
   0.26-dev
   
  +  Have the qmail-queue plugin add the message-id to the "Queued!"
  +  message we send back to the client (to help those odd sendmail using
  +  people debug their logs)
  +
     Set the process name to "qpsmtpd [1.2.3.4 : host.name.tld]"
   
     Fixed timeout bug when the client sent DATA and then stopped before