Cautiously added ENABLE_DISABLE_FSYNC and disable_fsync, hedged about

[exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index 221a4b69dc606acbb31be48b062024613c6cfb9e..db86947a46f3c4767a213b19d658e52f018668d3 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/receive.c,v 1.25 2006/02/07 11:19:00 ph10 Exp $ */
+/* $Cambridge: exim/src/src/receive.c,v 1.33 2007/01/22 16:29:54 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2006 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Code for receiving a message and setting up spool files. */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Code for receiving a message and setting up spool files. */


@@ -899,10 +899,10 @@ add_acl_headers(uschar *acl_name)
 header_line *h, *next;
 header_line *last_received = NULL;
 
 header_line *h, *next;
 header_line *last_received = NULL;
 

-if (acl_warn_headers == NULL) return;
+if (acl_added_headers == NULL) return;

 DEBUG(D_receive|D_acl) debug_printf(">>Headers added by %s ACL:\n", acl_name);
 
 DEBUG(D_receive|D_acl) debug_printf(">>Headers added by %s ACL:\n", acl_name);
 

-for (h = acl_warn_headers; h != NULL; h = next)
+for (h = acl_added_headers; h != NULL; h = next)

   {
   next = h->next;
 
   {
   next = h->next;
 


@@ -964,7 +964,7 @@ for (h = acl_warn_headers; h != NULL; h = next)
   DEBUG(D_receive|D_acl) debug_printf("  %s", header_last->text);
   }
 
   DEBUG(D_receive|D_acl) debug_printf("  %s", header_last->text);
   }
 

-acl_warn_headers = NULL;
+acl_added_headers = NULL;

 DEBUG(D_receive|D_acl) debug_printf(">>\n");
 }
 
 DEBUG(D_receive|D_acl) debug_printf(">>\n");
 }
 


@@ -1042,18 +1042,21 @@ memset(CS rfc822_file_path,0,2048);
 
 /* check if it is a MIME message */
 my_headerlist = header_list;
 
 /* check if it is a MIME message */
 my_headerlist = header_list;

-while (my_headerlist != NULL) {
+while (my_headerlist != NULL)
+  {

   /* skip deleted headers */
   /* skip deleted headers */

-  if (my_headerlist->type == '*') {
+  if (my_headerlist->type == '*')
+    {

     my_headerlist = my_headerlist->next;
     continue;
     my_headerlist = my_headerlist->next;
     continue;

-  };
-  if (strncmpic(my_headerlist->text, US"Content-Type:", 13) == 0) {
+    }
+  if (strncmpic(my_headerlist->text, US"Content-Type:", 13) == 0)
+    {

     DEBUG(D_receive) debug_printf("Found Content-Type: header - executing acl_smtp_mime.\n");
     goto DO_MIME_ACL;
     DEBUG(D_receive) debug_printf("Found Content-Type: header - executing acl_smtp_mime.\n");
     goto DO_MIME_ACL;

-  };
+    }

   my_headerlist = my_headerlist->next;
   my_headerlist = my_headerlist->next;

-};
+  }

 
 DEBUG(D_receive) debug_printf("No Content-Type: header - presumably not a MIME message.\n");
 return TRUE;
 
 DEBUG(D_receive) debug_printf("No Content-Type: header - presumably not a MIME message.\n");
 return TRUE;


@@ -1067,7 +1070,7 @@ if (mbox_file == NULL) {
          "acl_smtp_mime: error while creating mbox spool file, message temporarily rejected.");
   Uunlink(spool_name);
   unspool_mbox();
          "acl_smtp_mime: error while creating mbox spool file, message temporarily rejected.");
   Uunlink(spool_name);
   unspool_mbox();

-  smtp_respond(451, TRUE, US"temporary local problem");
+  smtp_respond(US"451", 3, TRUE, US"temporary local problem");

   message_id[0] = 0;            /* Indicate no message accepted */
   *smtp_reply_ptr = US"";       /* Indicate reply already sent */
   return FALSE;                 /* Indicate skip to end of receive function */
   message_id[0] = 0;            /* Indicate no message accepted */
   *smtp_reply_ptr = US"";       /* Indicate reply already sent */
   return FALSE;                 /* Indicate skip to end of receive function */


@@ -1080,18 +1083,21 @@ mime_part_count = -1;
 rc = mime_acl_check(acl, mbox_file, NULL, &user_msg, &log_msg);
 (void)fclose(mbox_file);
 
 rc = mime_acl_check(acl, mbox_file, NULL, &user_msg, &log_msg);
 (void)fclose(mbox_file);
 

-if (Ustrlen(rfc822_file_path) > 0) {
+if (Ustrlen(rfc822_file_path) > 0)
+  {

   mime_part_count = mime_part_count_buffer;
 
   mime_part_count = mime_part_count_buffer;
 

-  if (unlink(CS rfc822_file_path) == -1) {
+  if (unlink(CS rfc822_file_path) == -1)
+    {

     log_write(0, LOG_PANIC,
          "acl_smtp_mime: can't unlink RFC822 spool file, skipping.");
       goto END_MIME_ACL;
     log_write(0, LOG_PANIC,
          "acl_smtp_mime: can't unlink RFC822 spool file, skipping.");
       goto END_MIME_ACL;

-  };
-};
+    }
+  }

 
 /* check if we must check any message/rfc822 attachments */
 
 /* check if we must check any message/rfc822 attachments */

-if (rc == OK) {
+if (rc == OK)
+  {

   uschar temp_path[1024];
   int n;
   struct dirent *entry;
   uschar temp_path[1024];
   int n;
   struct dirent *entry;


@@ -1100,33 +1106,37 @@ if (rc == OK) {
   (void)string_format(temp_path, 1024, "%s/scan/%s", spool_directory,
     message_id);
 
   (void)string_format(temp_path, 1024, "%s/scan/%s", spool_directory,
     message_id);
 

- tempdir = opendir(CS temp_path);
- n = 0;
- do {
-   entry = readdir(tempdir);
-   if (entry == NULL) break;
-    if (strncmpic(US entry->d_name,US"__rfc822_",9) == 0) {
+  tempdir = opendir(CS temp_path);
+  n = 0;
+  do
+    {
+    entry = readdir(tempdir);
+    if (entry == NULL) break;
+    if (strncmpic(US entry->d_name,US"__rfc822_",9) == 0)
+      {

       (void)string_format(rfc822_file_path, 2048,"%s/scan/%s/%s", spool_directory, message_id, entry->d_name);
       (void)string_format(rfc822_file_path, 2048,"%s/scan/%s/%s", spool_directory, message_id, entry->d_name);

-     debug_printf("RFC822 attachment detected: running MIME ACL for '%s'\n", rfc822_file_path);
-     break;
-    };
- } while (1);
- closedir(tempdir);
+      debug_printf("RFC822 attachment detected: running MIME ACL for '%s'\n", rfc822_file_path);
+      break;
+      }
+    } while (1);
+  closedir(tempdir);

 
 

-  if (entry != NULL) {
+  if (entry != NULL)
+    {

     mbox_file = Ufopen(rfc822_file_path,"rb");
     mbox_file = Ufopen(rfc822_file_path,"rb");

-    if (mbox_file == NULL) {
+    if (mbox_file == NULL)
+      {

       log_write(0, LOG_PANIC,
          "acl_smtp_mime: can't open RFC822 spool file, skipping.");
       unlink(CS rfc822_file_path);
       goto END_MIME_ACL;
       log_write(0, LOG_PANIC,
          "acl_smtp_mime: can't open RFC822 spool file, skipping.");
       unlink(CS rfc822_file_path);
       goto END_MIME_ACL;

-    };
+      }

     /* set RFC822 expansion variable */
     mime_is_rfc822 = 1;
     mime_part_count_buffer = mime_part_count;
     goto MIME_ACL_CHECK;
     /* set RFC822 expansion variable */
     mime_is_rfc822 = 1;
     mime_part_count_buffer = mime_part_count;
     goto MIME_ACL_CHECK;

-  };
-};
+    }
+  }

 
 END_MIME_ACL:
 add_acl_headers(US"MIME");
 
 END_MIME_ACL:
 add_acl_headers(US"MIME");


@@ -1144,7 +1154,7 @@ else if (rc != OK)
   *smtp_reply_ptr = US"";       /* Indicate reply already sent */
   message_id[0] = 0;            /* Indicate no message accepted */
   return FALSE;                 /* Cause skip to end of receive function */
   *smtp_reply_ptr = US"";       /* Indicate reply already sent */
   message_id[0] = 0;            /* Indicate no message accepted */
   return FALSE;                 /* Cause skip to end of receive function */

-  };
+  }

 
 return TRUE;
 }
 
 return TRUE;
 }


@@ -1276,20 +1286,16 @@ uschar *queued_by = NULL;
 uschar *errmsg, *s;
 struct stat statbuf;
 
 uschar *errmsg, *s;
 struct stat statbuf;
 

-/* Final message to give to SMTP caller */
+/* Final message to give to SMTP caller, and messages from ACLs */

 
 uschar *smtp_reply = NULL;
 
 uschar *smtp_reply = NULL;

+uschar *user_msg, *log_msg;

 
 /* Working header pointers */
 
 header_line *h, *next;
 
 
 /* Working header pointers */
 
 header_line *h, *next;
 

-/* Flags for noting the existence of certain headers */
-
-/**** No longer check for these (Nov 2003)
-BOOL to_or_cc_header_exists = FALSE;
-BOOL bcc_header_exists = FALSE;
-****/
+/* Flags for noting the existence of certain headers (only one left) */

 
 BOOL date_header_exists = FALSE;
 
 
 BOOL date_header_exists = FALSE;
 


@@ -1852,24 +1858,12 @@ for (h = header_list->next; h != NULL; h = h->next)
 
   switch (header_checkname(h, is_resent))
     {
 
   switch (header_checkname(h, is_resent))
     {

-    /* "Bcc:" gets flagged, and its existence noted, whether it's resent- or
-    not. */
-

     case htype_bcc:
     case htype_bcc:

-    h->type = htype_bcc;
-    /****
-    bcc_header_exists = TRUE;
-    ****/
+    h->type = htype_bcc;        /* Both Bcc: and Resent-Bcc: */

     break;
 
     break;
 

-    /* "Cc:" gets flagged, and the existence of a recipient header is noted,
-    whether it's resent- or not. */
-

     case htype_cc:
     case htype_cc:

-    h->type = htype_cc;
-    /****
-    to_or_cc_header_exists = TRUE;
-    ****/
+    h->type = htype_cc;         /* Both Cc: and Resent-Cc: */

     break;
 
     /* Record whether a Date: or Resent-Date: header exists, as appropriate. */
     break;
 
     /* Record whether a Date: or Resent-Date: header exists, as appropriate. */


@@ -2068,8 +2062,6 @@ if (extract_recip)
     recipients_count = recipients_list_max = 0;
     }
 
     recipients_count = recipients_list_max = 0;
     }
 

-  parse_allow_group = TRUE;             /* Allow address group syntax */
-

   /* Now scan the headers */
 
   for (h = header_list->next; h != NULL; h = h->next)
   /* Now scan the headers */
 
   for (h = header_list->next; h != NULL; h = h->next)


@@ -2080,6 +2072,8 @@ if (extract_recip)
       uschar *s = Ustrchr(h->text, ':') + 1;
       while (isspace(*s)) s++;
 
       uschar *s = Ustrchr(h->text, ':') + 1;
       while (isspace(*s)) s++;
 

+      parse_allow_group = TRUE;          /* Allow address group syntax */
+

       while (*s != 0)
         {
         uschar *ss = parse_find_address_end(s, FALSE);
       while (*s != 0)
         {
         uschar *ss = parse_find_address_end(s, FALSE);


@@ -2144,24 +2138,19 @@ if (extract_recip)
 
         s = ss + (*ss? 1:0);
         while (isspace(*s)) s++;
 
         s = ss + (*ss? 1:0);
         while (isspace(*s)) s++;

-        }
+        }    /* Next address */
+
+      parse_allow_group = FALSE;      /* Reset group syntax flags */
+      parse_found_group = FALSE;

 
       /* If this was the bcc: header, mark it "old", which means it
       will be kept on the spool, but not transmitted as part of the
       message. */
 
 
       /* If this was the bcc: header, mark it "old", which means it
       will be kept on the spool, but not transmitted as part of the
       message. */
 

-      if (h->type == htype_bcc)
-        {
-        h->type = htype_old;
-        /****
-        bcc_header_exists = FALSE;
-        ****/
-        }
+      if (h->type == htype_bcc) h->type = htype_old;

       }   /* For appropriate header line */
     }     /* For each header line */
 
       }   /* For appropriate header line */
     }     /* For each header line */
 

-  parse_allow_group = FALSE;      /* Reset group syntax flags */
-  parse_found_group = FALSE;

   }
 
 /* Now build the unique message id. This has changed several times over the
   }
 
 /* Now build the unique message id. This has changed several times over the


@@ -2561,23 +2550,15 @@ for (h = header_list->next; h != NULL; h = h->next)
 
 
 /* An RFC 822 (sic) message is not legal unless it has at least one of "to",
 
 
 /* An RFC 822 (sic) message is not legal unless it has at least one of "to",

-"cc", or "bcc". Note that although the minimal examples in RFC822 show just
+"cc", or "bcc". Note that although the minimal examples in RFC 822 show just

 "to" or "bcc", the full syntax spec allows "cc" as well. If any resent- header
 exists, this applies to the set of resent- headers rather than the normal set.
 
 "to" or "bcc", the full syntax spec allows "cc" as well. If any resent- header
 exists, this applies to the set of resent- headers rather than the normal set.
 

-The requirement for a recipient header has been removed in RFC 2822. Earlier
-versions of Exim added a To: header for locally submitted messages, and an
-empty Bcc: header for others or when always_bcc was set. In the light of the
-changes in RFC 2822, we now always add Bcc: just in case there are still MTAs
-out there that insist on the RFC 822 syntax.
-
-November 2003: While generally revising what Exim does to fix up headers, it
-seems like a good time to remove this altogether. */
+The requirement for a recipient header has been removed in RFC 2822. At this
+point in the code, earlier versions of Exim added a To: header for locally
+submitted messages, and an empty Bcc: header for others. In the light of the
+changes in RFC 2822, this was dropped in November 2003. */

 
 

-/******
-if (!to_or_cc_header_exists && !bcc_header_exists)
-  header_add(htype_bcc, "Bcc:\n");
-******/

 
 /* If there is no date header, generate one if the message originates locally
 (i.e. not over TCP/IP) and suppress_local_fixups is not set, or if the
 
 /* If there is no date header, generate one if the message originates locally
 (i.e. not over TCP/IP) and suppress_local_fixups is not set, or if the


@@ -2749,7 +2730,7 @@ the input in cases of output errors, since the far end doesn't expect to see
 anything until the terminating dot line is sent. */
 
 if (fflush(data_file) == EOF || ferror(data_file) ||
 anything until the terminating dot line is sent. */
 
 if (fflush(data_file) == EOF || ferror(data_file) ||

-    fsync(fileno(data_file)) < 0 || (receive_ferror)())
+    EXIMfsync(fileno(data_file)) < 0 || (receive_ferror)())

   {
   uschar *msg_errno = US strerror(errno);
   BOOL input_error = (receive_ferror)() != 0;
   {
   uschar *msg_errno = US strerror(errno);
   BOOL input_error = (receive_ferror)() != 0;


@@ -2932,6 +2913,7 @@ $message_body_end can be extracted if needed. Allow $recipients in expansions.
 */
 
 deliver_datafile = data_fd;
 */
 
 deliver_datafile = data_fd;

+user_msg = NULL;

 
 if (recipients_count == 0)
   {
 
 if (recipients_count == 0)
   {


@@ -2961,7 +2943,6 @@ else
 
     if (acl_smtp_data != NULL && recipients_count > 0)
       {
 
     if (acl_smtp_data != NULL && recipients_count > 0)
       {

-      uschar *user_msg, *log_msg;

       rc = acl_check(ACL_WHERE_DATA, NULL, acl_smtp_data, &user_msg, &log_msg);
       add_acl_headers(US"DATA");
       if (rc == DISCARD)
       rc = acl_check(ACL_WHERE_DATA, NULL, acl_smtp_data, &user_msg, &log_msg);
       add_acl_headers(US"DATA");
       if (rc == DISCARD)


@@ -3016,8 +2997,13 @@ else
 #ifdef WITH_CONTENT_SCAN
         unspool_mbox();
 #endif
 #ifdef WITH_CONTENT_SCAN
         unspool_mbox();
 #endif

-        log_write(0, LOG_MAIN|LOG_REJECT, "F=<%s> rejected by non-SMTP ACL: %s",
-          sender_address, log_msg);
+        /* The ACL can specify where rejections are to be logged, possibly
+        nowhere. The default is main and reject logs. */
+
+        if (log_reject_target != 0)
+          log_write(0, log_reject_target, "F=<%s> rejected by non-SMTP ACL: %s",
+            sender_address, log_msg);
+

         if (user_msg == NULL) user_msg = US"local configuration problem";
         if (smtp_batched_input)
           {
         if (user_msg == NULL) user_msg = US"local configuration problem";
         if (smtp_batched_input)
           {


@@ -3141,9 +3127,9 @@ else
   {
   uschar *istemp = US"";
   uschar *s = NULL;
   {
   uschar *istemp = US"";
   uschar *s = NULL;

+  uschar *smtp_code;

   int size = 0;
   int sptr = 0;
   int size = 0;
   int sptr = 0;

-  int code;

 
   errmsg = local_scan_data;
 
 
   errmsg = local_scan_data;
 


@@ -3160,7 +3146,7 @@ else
     /* Fall through */
 
     case LOCAL_SCAN_REJECT:
     /* Fall through */
 
     case LOCAL_SCAN_REJECT:

-    code = 550;
+    smtp_code = US"550";

     if (errmsg == NULL) errmsg =  US"Administrative prohibition";
     break;
 
     if (errmsg == NULL) errmsg =  US"Administrative prohibition";
     break;
 


@@ -3170,7 +3156,7 @@ else
 
     case LOCAL_SCAN_TEMPREJECT:
     TEMPREJECT:
 
     case LOCAL_SCAN_TEMPREJECT:
     TEMPREJECT:

-    code = 451;
+    smtp_code = US"451";

     if (errmsg == NULL) errmsg = US"Temporary local problem";
     istemp = US"temporarily ";
     break;
     if (errmsg == NULL) errmsg = US"Temporary local problem";
     istemp = US"temporarily ";
     break;


@@ -3188,14 +3174,14 @@ else
     {
     if (!smtp_batched_input)
       {
     {
     if (!smtp_batched_input)
       {

-      smtp_respond(code, TRUE, errmsg);
+      smtp_respond(smtp_code, 3, TRUE, errmsg);

       message_id[0] = 0;            /* Indicate no message accepted */
       smtp_reply = US"";            /* Indicate reply already sent */
       goto TIDYUP;                  /* Skip to end of function */
       }
     else
       {
       message_id[0] = 0;            /* Indicate no message accepted */
       smtp_reply = US"";            /* Indicate reply already sent */
       goto TIDYUP;                  /* Skip to end of function */
       }
     else
       {

-      moan_smtp_batch(NULL, "%d %s", code, errmsg);
+      moan_smtp_batch(NULL, "%s %s", smtp_code, errmsg);

       /* Does not return */
       }
     }
       /* Does not return */
       }
     }


@@ -3514,19 +3500,35 @@ if (smtp_input)
     if (smtp_reply == NULL)
       {
       if (fake_response != OK)
     if (smtp_reply == NULL)
       {
       if (fake_response != OK)

-        smtp_respond(fake_response == DEFER ? 450 : 550,
-                     TRUE, fake_response_text);
+        smtp_respond((fake_response == DEFER)? US"450" : US"550", 3, TRUE,
+          fake_response_text);
+
+      /* An OK response is required; use "message" text if present. */
+
+      else if (user_msg != NULL)
+        {
+        uschar *code = US"250";
+        int len = 3;
+        smtp_message_code(&code, &len, &user_msg, NULL);
+        smtp_respond(code, len, TRUE, user_msg);
+        }
+
+      /* Default OK response */
+

       else
         smtp_printf("250 OK id=%s\r\n", message_id);
       if (host_checking)
         fprintf(stdout,
           "\n**** SMTP testing: that is not a real message id!\n\n");
       }
       else
         smtp_printf("250 OK id=%s\r\n", message_id);
       if (host_checking)
         fprintf(stdout,
           "\n**** SMTP testing: that is not a real message id!\n\n");
       }

+
+    /* smtp_reply was previously set */
+

     else if (smtp_reply[0] != 0)
       {
       if (fake_response != OK && (smtp_reply[0] == '2'))
     else if (smtp_reply[0] != 0)
       {
       if (fake_response != OK && (smtp_reply[0] == '2'))

-        smtp_respond(fake_response == DEFER ? 450 : 550,
-                     TRUE, fake_response_text);
+        smtp_respond((fake_response == DEFER)? US"450" : US"550", 3, TRUE,
+          fake_response_text);

       else
         smtp_printf("%.1024s\r\n", smtp_reply);
       }
       else
         smtp_printf("%.1024s\r\n", smtp_reply);
       }