On Fri, May 03, 2002 at 03:40:00PM +0200, Henning Brauer wrote:
> Expect a new (bit nicer) patch within the next hour or so.

Now it's ok ;-)

bounce from qmail-ldap, patch below applied, no custombouncetext:

##cut##
Hi. This is the qmail-send program at smtp.bsws.de.
I'm afraid I wasn't able to deliver your message to the following addresses.
This is a permanent error; I've given up. Sorry it didn't work out.

<[EMAIL PROTECTED]>:
Sorry, no mailbox here by that name. (#5.1.1)

--- Below this line is a copy of the message.
##cut##

bounce from qmail-ldap, patch below applied, with custombouncetext:

##cut##
Hi. This is the qmail-send program at smtp.bsws.de.
I'm afraid I wasn't able to deliver your message to the following addresses.
This is a permanent error; I've given up. Sorry it didn't work out.
-
This is the custom bounce text.
-

<[EMAIL PROTECTED]>:
Sorry, no mailbox here by that name. (#5.1.1)

--- Below this line is a copy of the message.
##cut##

As you can see, the bounce message doesn't differ from stock qmail's one as
long as you don't define a custombouncetext. If you do, you are still qsmbf
compliant. Note that the custombouncetext SHOULD be \n terminated for nice
appearance, and it MUST NOT contain \n\n anywhere  (otherwise you break 
qsmbf again).

--- qmail-send.c.orig2  Fri May  3 14:23:35 2002
+++ qmail-send.c        Fri May  3 15:46:25 2002
@@ -715,17 +715,18 @@
    qmail_puts(&qqt,*sender.s ? ".\n\
 I'm afraid I wasn't able to deliver your message to the following addresses.\n\
 This is a permanent error; I've given up. Sorry it didn't work out.\n\
-\n\
 " : ".\n\
 I tried to deliver a bounce message to this address, but the bounce bounced!\n\
-\n\
 ");
 
-   if (custombouncetext.len)
+   if (custombouncetext.len > 1)
    {
+     qmail_puts(&qqt,"-\n");
      qmail_put(&qqt,custombouncetext.s,custombouncetext.len-1);
-     qmail_puts(&qqt,"\n\n");
+     qmail_puts(&qqt,"-\n");
    }
+         
+   qmail_puts(&qqt, "\n");
 
    fd = open_read(fn2.s);
    if (fd == -1)

-- 
| Henning Brauer  | PGP-Key: http://misc.bsws.de/hb/pubkey.asc          
| BS Web Services | Roedingsmarkt 14, 20459 Hamburg, DE | http://bsws.de
Unix is very simple, but it takes a genius to understand the simplicity.
(Dennis Ritchie)

Reply via email to