Integrated SPF Best Guess. Fixes: bug #521

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

diff --git a/src/src/rda.c b/src/src/rda.c
index 1be7b1cc4a21dd4e4760489ef2f7b062793b1b5e..13701dca47b6f141c28330598ff46441725d804c 100644 (file)
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/rda.c,v 1.7 2005/06/16 14:10:13 ph10 Exp $ */
+/* $Cambridge: exim/src/src/rda.c,v 1.14 2007/01/08 10:50:18 ph10 Exp $ */

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

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

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code for extracting addresses from a forwarding list
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This module contains code for extracting addresses from a forwarding list


@@ -302,14 +302,14 @@ filebuf[statbuf.st_size] = 0;
 DEBUG(D_route)
   debug_printf(OFF_T_FMT " bytes read from %s\n", statbuf.st_size, filename);
 
 DEBUG(D_route)
   debug_printf(OFF_T_FMT " bytes read from %s\n", statbuf.st_size, filename);
 

-fclose(fwd);
+(void)fclose(fwd);

 return filebuf;
 
 /* Return an error: the string is already set up. */
 
 ERROR_RETURN:
 *yield = FF_ERROR;
 return filebuf;
 
 /* Return an error: the string is already set up. */
 
 ERROR_RETURN:
 *yield = FF_ERROR;

-fclose(fwd);
+(void)fclose(fwd);

 return NULL;
 }
 
 return NULL;
 }
 


@@ -352,7 +352,7 @@ uschar *data;
 
 if (rdata->isfile)
   {
 
 if (rdata->isfile)
   {

-  int yield;
+  int yield = 0;

   data = rda_get_file_contents(rdata, options, error, &yield);
   if (data == NULL) return yield;
   }
   data = rda_get_file_contents(rdata, options, error, &yield);
   if (data == NULL) return yield;
   }


@@ -446,8 +446,8 @@ static void
 rda_write_string(int fd, uschar *s)
 {
 int len = (s == NULL)? 0 : Ustrlen(s) + 1;
 rda_write_string(int fd, uschar *s)
 {
 int len = (s == NULL)? 0 : Ustrlen(s) + 1;

-write(fd, &len, sizeof(int));
-if (s != NULL) write(fd, s, len);
+(void)write(fd, &len, sizeof(int));
+if (s != NULL) (void)write(fd, s, len);

 }
 
 
 }
 
 


@@ -607,15 +607,19 @@ if (pipe(pfd) != 0)
 
 /* Ensure that SIGCHLD is set to SIG_DFL before forking, so that the child
 process can be waited for. We sometimes get here with it set otherwise. Save
 
 /* Ensure that SIGCHLD is set to SIG_DFL before forking, so that the child
 process can be waited for. We sometimes get here with it set otherwise. Save

-the old state for resetting on the wait. */
+the old state for resetting on the wait. Ensure that all cached resources are
+freed so that the subprocess starts with a clean slate and doesn't interfere
+with the parent process. */

 
 oldsignal = signal(SIGCHLD, SIG_DFL);
 
 oldsignal = signal(SIGCHLD, SIG_DFL);

+search_tidyup();
+

 if ((pid = fork()) == 0)
   {
   header_line *waslast = header_last;   /* Save last header */
 
   fd = pfd[pipe_write];
 if ((pid = fork()) == 0)
   {
   header_line *waslast = header_last;   /* Save last header */
 
   fd = pfd[pipe_write];

-  close(pfd[pipe_read]);
+  (void)close(pfd[pipe_read]);

   exim_setugid(ugid->uid, ugid->gid, FALSE, rname);
 
   /* Addresses can get rewritten in filters; if we are not root or the exim
   exim_setugid(ugid->uid, ugid->gid, FALSE, rname);
 
   /* Addresses can get rewritten in filters; if we are not root or the exim


@@ -638,8 +642,8 @@ if ((pid = fork()) == 0)
   /* Pass back whether it was a filter, and the return code and any overall
   error text via the pipe. */
 
   /* Pass back whether it was a filter, and the return code and any overall
   error text via the pipe. */
 

-  write(fd, filtertype, sizeof(int));
-  write(fd, &yield, sizeof(int));
+  (void)write(fd, filtertype, sizeof(int));
+  (void)write(fd, &yield, sizeof(int));

   rda_write_string(fd, *error);
 
   /* Pass back the contents of any syntax error blocks if we have a pointer */
   rda_write_string(fd, *error);
 
   /* Pass back the contents of any syntax error blocks if we have a pointer */


@@ -665,10 +669,10 @@ if ((pid = fork()) == 0)
     header_line *h;
     for (h = header_list; h != waslast->next; i++, h = h->next)
       {
     header_line *h;
     for (h = header_list; h != waslast->next; i++, h = h->next)
       {

-      if (h->type == htype_old) write(fd, &i, sizeof(i));
+      if (h->type == htype_old) (void)write(fd, &i, sizeof(i));

       }
     i = -1;
       }
     i = -1;

-    write(fd, &i, sizeof(i));
+    (void)write(fd, &i, sizeof(i));

 
     while (waslast != header_last)
       {
 
     while (waslast != header_last)
       {


@@ -676,7 +680,7 @@ if ((pid = fork()) == 0)
       if (waslast->type != htype_old)
         {
         rda_write_string(fd, waslast->text);
       if (waslast->type != htype_old)
         {
         rda_write_string(fd, waslast->text);

-        write(fd, &(waslast->type), sizeof(waslast->type));
+        (void)write(fd, &(waslast->type), sizeof(waslast->type));

         }
       }
     rda_write_string(fd, NULL);    /* Indicates end of added headers */
         }
       }
     rda_write_string(fd, NULL);    /* Indicates end of added headers */


@@ -684,7 +688,7 @@ if ((pid = fork()) == 0)
 
   /* Write the contents of the $n variables */
 
 
   /* Write the contents of the $n variables */
 

-  write(fd, filter_n, sizeof(filter_n));
+  (void)write(fd, filter_n, sizeof(filter_n));

 
   /* If the result was DELIVERED or NOTDELIVERED, we pass back the generated
   addresses, and their associated information, through the pipe. This is
 
   /* If the result was DELIVERED or NOTDELIVERED, we pass back the generated
   addresses, and their associated information, through the pipe. This is


@@ -701,8 +705,8 @@ if ((pid = fork()) == 0)
       int reply_options = 0;
 
       rda_write_string(fd, addr->address);
       int reply_options = 0;
 
       rda_write_string(fd, addr->address);

-      write(fd, &(addr->mode), sizeof(addr->mode));
-      write(fd, &(addr->flags), sizeof(addr->flags));
+      (void)write(fd, &(addr->mode), sizeof(addr->mode));
+      (void)write(fd, &(addr->flags), sizeof(addr->flags));

       rda_write_string(fd, addr->p.errors_address);
 
       if (addr->pipe_expandn != NULL)
       rda_write_string(fd, addr->p.errors_address);
 
       if (addr->pipe_expandn != NULL)


@@ -714,15 +718,15 @@ if ((pid = fork()) == 0)
       rda_write_string(fd, NULL);
 
       if (addr->reply == NULL)
       rda_write_string(fd, NULL);
 
       if (addr->reply == NULL)

-        write(fd, &reply_options, sizeof(int));    /* 0 means no reply */
+        (void)write(fd, &reply_options, sizeof(int));    /* 0 means no reply */

       else
         {
         reply_options |= REPLY_EXISTS;
         if (addr->reply->file_expand) reply_options |= REPLY_EXPAND;
         if (addr->reply->return_message) reply_options |= REPLY_RETURN;
       else
         {
         reply_options |= REPLY_EXISTS;
         if (addr->reply->file_expand) reply_options |= REPLY_EXPAND;
         if (addr->reply->return_message) reply_options |= REPLY_RETURN;

-        write(fd, &reply_options, sizeof(int));
-        write(fd, &(addr->reply->expand_forbid), sizeof(int));
-        write(fd, &(addr->reply->once_repeat), sizeof(time_t));
+        (void)write(fd, &reply_options, sizeof(int));
+        (void)write(fd, &(addr->reply->expand_forbid), sizeof(int));
+        (void)write(fd, &(addr->reply->once_repeat), sizeof(time_t));

         rda_write_string(fd, addr->reply->to);
         rda_write_string(fd, addr->reply->cc);
         rda_write_string(fd, addr->reply->bcc);
         rda_write_string(fd, addr->reply->to);
         rda_write_string(fd, addr->reply->cc);
         rda_write_string(fd, addr->reply->bcc);


@@ -740,9 +744,11 @@ if ((pid = fork()) == 0)
     rda_write_string(fd, NULL);   /* Marks end of addresses */
     }
 
     rda_write_string(fd, NULL);   /* Marks end of addresses */
     }
 

-  /* OK, this process is now done. Must use _exit() and not exit() !! */
+  /* OK, this process is now done. Free any cached resources. Must use _exit()
+  and not exit() !! */

 
 

-  close(fd);
+  (void)close(fd);
+  search_tidyup();

   _exit(0);
   }
 
   _exit(0);
   }
 


@@ -755,7 +761,7 @@ if (pid < 0)
 writing end must be closed first, as otherwise read() won't return zero on an
 empty pipe. Afterwards, close the reading end. */
 
 writing end must be closed first, as otherwise read() won't return zero on an
 empty pipe. Afterwards, close the reading end. */
 

-close(pfd[pipe_write]);
+(void)close(pfd[pipe_write]);

 
 /* Read initial data, including yield and contents of *error */
 
 
 /* Read initial data, including yield and contents of *error */
 


@@ -764,9 +770,6 @@ if (read(fd, filtertype, sizeof(int)) != sizeof(int) ||
     read(fd, &yield, sizeof(int)) != sizeof(int) ||
     !rda_read_string(fd, error)) goto DISASTER;
 
     read(fd, &yield, sizeof(int)) != sizeof(int) ||
     !rda_read_string(fd, error)) goto DISASTER;
 

-DEBUG(D_route)
-  debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
-

 /* Read the contents of any syntax error blocks if we have a pointer */
 
 if (eblockp != NULL)
 /* Read the contents of any syntax error blocks if we have a pointer */
 
 if (eblockp != NULL)


@@ -923,6 +926,9 @@ while ((rc = wait(&status)) != pid)
     }
   }
 
     }
   }
 

+DEBUG(D_route)
+  debug_printf("rda_interpret: subprocess yield=%d error=%s\n", yield, *error);
+

 if (had_disaster)
   {
   *error = string_sprintf("internal problem in %s: failure to transfer "
 if (had_disaster)
   {
   *error = string_sprintf("internal problem in %s: failure to transfer "


@@ -940,7 +946,7 @@ else if (status != 0)
   }
 
 FINAL_EXIT:
   }
 
 FINAL_EXIT:

-close(fd);
+(void)close(fd);

 signal(SIGCHLD, oldsignal);   /* restore */
 return yield;
 
 signal(SIGCHLD, oldsignal);   /* restore */
 return yield;