Jesse Norell wrote:
* lmtp.c (lmtp): fix silly auto_reply bug.
You might run "grep -ir deliver-to" through the source
(1.2, 2.0 and 2.1) and fix all those typo's. I just checked
dbmail_2_0_branch, and those are still in there.
I fixed head and dbmail_2_0_branch. I've attached the patch for 1.2. Someone else please apply and commit it
cause I haven't got a tree around right now, just my debian tree.
--
________________________________________________________________
Paul Stevens mailto:[EMAIL PROTECTED]
NET FACILITIES GROUP PGP: finger [EMAIL PROTECTED]
The Netherlands________________________________http://www.nfg.nl
Index: injector.c
===================================================================
RCS file: /pub/source/dbmail/injector.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 injector.c
--- injector.c 24 Oct 2003 09:21:30 -0000 1.1.1.1
+++ injector.c 15 Nov 2004 20:01:24 -0000
@@ -27,7 +27,7 @@
/* syslog */
#define PNAME "dbmail/smtp-injector"
-char default_scan_field[] = "deliver-to";
+char default_scan_field[] = "delivered-to";
char *blk;
char *header;
unsigned hdrlen;
@@ -75,7 +75,7 @@
if (argc < 2)
{
printf ("\nUsage: %s -n [headerfield] for normal deliveries "
- "(default: \"deliver-to\" header)\n",argv[0]);
+ "(default: \"delivered-to\" header)\n",argv[0]);
printf (" %s -m \"mailbox\" -u [username] for delivery to mailbox (name)\n"
,argv[0]);
printf (" %s -d [addresses] for delivery without using scanner\n",argv[0]);
Index: main.c
===================================================================
RCS file: /pub/source/dbmail/main.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 main.c
--- main.c 24 Oct 2003 09:21:30 -0000 1.1.1.1
+++ main.c 15 Nov 2004 20:01:24 -0000
@@ -60,7 +60,7 @@
{
printf ("\n*** DBMAIL: dbmail-smtp version $Revision: 1.41 $ %s\n",COPYRIGHT);
printf ("\nUsage: %s -n [headerfield] for normal deliveries "
- "(default: \"deliver-to\" header)\n",argv[0]);
+ "(default: \"delivered-to\" header)\n",argv[0]);
printf (" %s -m \"mailbox\" -u [username] for delivery to mailbox (name)\n"
,argv[0]);
printf (" %s -d [addresses] for delivery without using scanner\n",argv[0]);
@@ -170,8 +170,8 @@
argv[INDEX_DELIVERY_MODE+1]);
}
else
- if (mail_adr_list ("deliver-to",&users,&mimelist) != 0)
- trace(TRACE_STOP,"main(): scanner found no email addresses (scanned for Deliver-To:)");
+ if (mail_adr_list ("delivered-to",&users,&mimelist) != 0)
+ trace(TRACE_STOP,"main(): scanner found no email addresses (scanned for Delivered-To:)");
}
srand((int) ((int) time(NULL) + (int) getpid()) );
Index: pipe.c
===================================================================
RCS file: /pub/source/dbmail/pipe.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 pipe.c
--- pipe.c 15 Sep 2004 14:21:09 -0000 1.1.1.3
+++ pipe.c 15 Nov 2004 20:01:24 -0000
@@ -661,7 +661,7 @@
subject = record->value;
trace(TRACE_DEBUG, "send_reply(): found SUBJECT [%s]", subject);
}
- else if (strcasecmp(record->field, "deliver-to") == 0)
+ else if (strcasecmp(record->field, "delivered-to") == 0)
{
to = record->value;
trace(TRACE_DEBUG, "send_reply(): found TO [%s]", to);
