ipliteral was not recognizing "ipv6" prefix.

[user/henk/code/exim.git] / src / src / deliver.c

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 23875d959b28a2696b3237b1fd13d0adb72da72a..83a3d1ad4e48ccdacd9ab96eeb02bd0dfc12f5d2 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/deliver.c,v 1.21 2005/06/28 10:23:35 ph10 Exp $ */
+/* $Cambridge: exim/src/src/deliver.c,v 1.23 2005/11/14 13:56:49 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -1991,7 +1991,7 @@ if (addr->special_action == SPECIAL_WARN &&
 
       if (errors_reply_to != NULL)
         fprintf(f, "Reply-To: %s\n", errors_reply_to);
-      fprintf(f, "Auto-Submitted: auto-generated\n");
+      fprintf(f, "Auto-Submitted: auto-replied\n");
       fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
         qualify_domain_sender);
       fprintf(f, "%s", CS warn_message);
@@ -5856,6 +5856,15 @@ deliveries are done first, then remote ones. If ever the problems of how to
 handle fallback transports are figured out, this section can be put into a loop
 for handling fallbacks, though the uid switching will have to be revised. */
 
+/* Precompile a regex that is used to recognize a parameter in response
+to an LHLO command, if is isn't already compiled. This may be used on both
+local and remote LMTP deliveries. */
+
+if (regex_IGNOREQUOTA == NULL) regex_IGNOREQUOTA =
+  regex_must_compile(US"\\n250[\\s\\-]IGNOREQUOTA(\\s|\\n|$)", FALSE, TRUE);
+
+/* Handle local deliveries */
+
 if (addr_local != NULL)
   {
   DEBUG(D_deliver|D_transport)
@@ -6168,7 +6177,7 @@ while (addr_failed != NULL)
 
       if (errors_reply_to != NULL)
         fprintf(f, "Reply-To: %s\n", errors_reply_to);
-      fprintf(f, "Auto-Submitted: auto-generated\n");
+      fprintf(f, "Auto-Submitted: auto-replied\n");
       fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
         qualify_domain_sender);
       fprintf(f, "To: %s\n", bounce_recipient);
@@ -6690,7 +6699,7 @@ else if (addr_defer != (address_item *)(+1))
 
         if (errors_reply_to != NULL)
           fprintf(f, "Reply-To: %s\n", errors_reply_to);
-        fprintf(f, "Auto-Submitted: auto-generated\n");
+        fprintf(f, "Auto-Submitted: auto-replied\n");
         fprintf(f, "From: Mail Delivery System <Mailer-Daemon@%s>\n",
           qualify_domain_sender);
         fprintf(f, "To: %s\n", recipients);