TLS: add variables for the IETF standard name for the connection ciphersuite

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

diff --git a/src/src/rda.c b/src/src/rda.c
index 995909b09258d053f2bc542d845da14d53a03c2c..228f574097b0877daf0677080e1c6b3cf7f1e4f9 100644 (file)
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2016 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* 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


@@ -42,14 +42,14 @@ static BOOL
 match_tag(const uschar *s, const uschar *tag)
 {
 for (; *tag != 0; s++, tag++)
 match_tag(const uschar *s, const uschar *tag)
 {
 for (; *tag != 0; s++, tag++)

-  {

   if (*tag == ' ')
     {
     while (*s == ' ' || *s == '\t') s++;
     s--;
     }
   if (*tag == ' ')
     {
     while (*s == ' ' || *s == '\t') s++;
     s--;
     }

-  else if (tolower(*s) != tolower(*tag)) break;
-  }
+  else
+   if (tolower(*s) != tolower(*tag)) break;
+

 return (*tag == 0);
 }
 
 return (*tag == 0);
 }
 


@@ -110,7 +110,7 @@ if (saved_errno == ENOENT)
   slash = Ustrrchr(big_buffer, '/');
   Ustrcpy(slash+1, ".");
 
   slash = Ustrrchr(big_buffer, '/');
   Ustrcpy(slash+1, ".");
 

-  alarm(30);
+  ALARM(30);

   rc = Ustat(big_buffer, &statbuf);
   if (rc != 0 && errno == EACCES && !sigalrm_seen)
     {
   rc = Ustat(big_buffer, &statbuf);
   if (rc != 0 && errno == EACCES && !sigalrm_seen)
     {


@@ -118,7 +118,7 @@ if (saved_errno == ENOENT)
     rc = Ustat(big_buffer, &statbuf);
     }
   saved_errno = errno;
     rc = Ustat(big_buffer, &statbuf);
     }
   saved_errno = errno;

-  alarm(0);
+  ALARM_CLR(0);

 
   DEBUG(D_route) debug_printf("stat(%s)=%d\n", big_buffer, rc);
   }
 
   DEBUG(D_route) debug_printf("stat(%s)=%d\n", big_buffer, rc);
   }


@@ -250,11 +250,8 @@ if (!uid_ok)
   if (rdata->pw != NULL && statbuf.st_uid == rdata->pw->pw_uid)
     uid_ok = TRUE;
   else if (rdata->owners != NULL)
   if (rdata->pw != NULL && statbuf.st_uid == rdata->pw->pw_uid)
     uid_ok = TRUE;
   else if (rdata->owners != NULL)

-    {
-    int i;
-    for (i = 1; i <= (int)(rdata->owners[0]); i++)
+    for (int i = 1; i <= (int)(rdata->owners[0]); i++)

       if (rdata->owners[i] == statbuf.st_uid) { uid_ok = TRUE; break; }
       if (rdata->owners[i] == statbuf.st_uid) { uid_ok = TRUE; break; }

-    }

   }
 
 if (!gid_ok)
   }
 
 if (!gid_ok)


@@ -262,11 +259,8 @@ if (!gid_ok)
   if (rdata->pw != NULL && statbuf.st_gid == rdata->pw->pw_gid)
     gid_ok = TRUE;
   else if (rdata->owngroups != NULL)
   if (rdata->pw != NULL && statbuf.st_gid == rdata->pw->pw_gid)
     gid_ok = TRUE;
   else if (rdata->owngroups != NULL)

-    {
-    int i;
-    for (i = 1; i <= (int)(rdata->owngroups[0]); i++)
+    for (int i = 1; i <= (int)(rdata->owngroups[0]); i++)

       if (rdata->owngroups[i] == statbuf.st_gid) { gid_ok = TRUE; break; }
       if (rdata->owngroups[i] == statbuf.st_gid) { gid_ok = TRUE; break; }

-    }

   }
 
 if (!uid_ok || !gid_ok)
   }
 
 if (!uid_ok || !gid_ok)


@@ -358,7 +352,7 @@ if (rdata->isfile)
   }
 else data = rdata->string;
 
   }
 else data = rdata->string;
 

-*filtertype = system_filtering? FILTER_EXIM : rda_is_filter(data);
+*filtertype = f.system_filtering ? FILTER_EXIM : rda_is_filter(data);

 
 /* Filter interpretation is done by a general function that is also called from
 the filter testing option (-bf). There are two versions: one for Exim filtering
 
 /* Filter interpretation is done by a general function that is also called from
 the filter testing option (-bf). There are two versions: one for Exim filtering


@@ -492,7 +486,7 @@ return TRUE;
 /* This function is passed a forward list string (unexpanded) or the name of a
 file (unexpanded) whose contents are the forwarding list. The list may in fact
 be a filter program if it starts with "#Exim filter" or "#Sieve filter". Other
 /* This function is passed a forward list string (unexpanded) or the name of a
 file (unexpanded) whose contents are the forwarding list. The list may in fact
 be a filter program if it starts with "#Exim filter" or "#Sieve filter". Other

-types of filter, with different inital tag strings, may be introduced in due
+types of filter, with different initial tag strings, may be introduced in due

 course.
 
 The job of the function is to process the forwarding list or filter. It is
 course.
 
 The job of the function is to process the forwarding list or filter. It is


@@ -566,7 +560,7 @@ DEBUG(D_route) debug_printf("rda_interpret (%s): %s\n",
 data = expand_string(rdata->string);
 if (data == NULL)
   {
 data = expand_string(rdata->string);
 if (data == NULL)
   {

-  if (expand_string_forcedfail) return FF_NOTDELIVERED;
+  if (f.expand_string_forcedfail) return FF_NOTDELIVERED;

   *error = string_sprintf("failed to expand \"%s\": %s", rdata->string,
     expand_string_message);
   return FF_ERROR;
   *error = string_sprintf("failed to expand \"%s\": %s", rdata->string,
     expand_string_message);
   return FF_ERROR;


@@ -656,10 +650,9 @@ if ((pid = fork()) == 0)
 
   /* Pass back the contents of any syntax error blocks if we have a pointer */
 
 
   /* Pass back the contents of any syntax error blocks if we have a pointer */
 

-  if (eblockp != NULL)
+  if (eblockp)

     {
     {

-    error_block *ep;
-    for (ep = *eblockp; ep != NULL; ep = ep->next)
+    for (error_block * ep = *eblockp; ep; ep = ep->next)

       if (  rda_write_string(fd, ep->text1) != 0
          || rda_write_string(fd, ep->text2) != 0
         )
       if (  rda_write_string(fd, ep->text1) != 0
          || rda_write_string(fd, ep->text2) != 0
         )


@@ -672,11 +665,10 @@ if ((pid = fork()) == 0)
   original header lines that were removed, and then any header lines that were
   added but not subsequently removed. */
 
   original header lines that were removed, and then any header lines that were
   added but not subsequently removed. */
 

-  if (system_filtering)
+  if (f.system_filtering)

     {
     int i = 0;
     {
     int i = 0;

-    header_line *h;
-    for (h = header_list; h != waslast->next; i++, h = h->next)
+    for (header_line * h = header_list; h != waslast->next; i++, h = h->next)

       if (  h->type == htype_old
          && write(fd, &i, sizeof(i)) != sizeof(i)
         )
       if (  h->type == htype_old
          && write(fd, &i, sizeof(i)) != sizeof(i)
         )


@@ -714,31 +706,27 @@ if ((pid = fork()) == 0)
   if (yield == FF_DELIVERED || yield == FF_NOTDELIVERED ||
       yield == FF_FAIL || yield == FF_FREEZE)
     {
   if (yield == FF_DELIVERED || yield == FF_NOTDELIVERED ||
       yield == FF_FAIL || yield == FF_FREEZE)
     {

-    address_item *addr;
-    for (addr = *generated; addr != NULL; addr = addr->next)
+    for (address_item * addr = *generated; addr; addr = addr->next)

       {
       int reply_options = 0;
       {
       int reply_options = 0;

+      int ig_err = addr->prop.ignore_error ? 1 : 0;

 
       if (  rda_write_string(fd, addr->address) != 0
 
       if (  rda_write_string(fd, addr->address) != 0

-         || write(fd, &(addr->mode), sizeof(addr->mode))
-           != sizeof(addr->mode)
-         || write(fd, &(addr->flags), sizeof(addr->flags))
-           != sizeof(addr->flags)
+         || write(fd, &addr->mode, sizeof(addr->mode)) != sizeof(addr->mode)
+         || write(fd, &addr->flags, sizeof(addr->flags)) != sizeof(addr->flags)

          || rda_write_string(fd, addr->prop.errors_address) != 0
          || rda_write_string(fd, addr->prop.errors_address) != 0

+         || write(fd, &ig_err, sizeof(ig_err)) != sizeof(ig_err)

         )
        goto bad;
 
         )
        goto bad;
 

-      if (addr->pipe_expandn != NULL)
-        {
-        uschar **pp;
-        for (pp = addr->pipe_expandn; *pp != NULL; pp++)
+      if (addr->pipe_expandn)
+        for (uschar ** pp = addr->pipe_expandn; *pp; pp++)

           if (rda_write_string(fd, *pp) != 0)
            goto bad;
           if (rda_write_string(fd, *pp) != 0)
            goto bad;

-        }

       if (rda_write_string(fd, NULL) != 0)
         goto bad;
 
       if (rda_write_string(fd, NULL) != 0)
         goto bad;
 

-      if (addr->reply == NULL)
+      if (!addr->reply)

        {
         if (write(fd, &reply_options, sizeof(int)) != sizeof(int))    /* 0 means no reply */
          goto bad;
        {
         if (write(fd, &reply_options, sizeof(int)) != sizeof(int))    /* 0 means no reply */
          goto bad;


@@ -809,8 +797,7 @@ if (read(fd, filtertype, sizeof(int)) != sizeof(int) ||
 if (eblockp)
   {
   error_block *e;
 if (eblockp)
   {
   error_block *e;

-  error_block **p;
-  for (p = eblockp; ; p = &e->next)
+  for (error_block ** p = eblockp; ; p = &e->next)

     {
     uschar *s;
     if (!rda_read_string(fd, &s)) goto DISASTER;
     {
     uschar *s;
     if (!rda_read_string(fd, &s)) goto DISASTER;


@@ -827,7 +814,7 @@ if (eblockp)
 /* If this is a system filter, read the identify of any original header lines
 that were removed, and then read data for any new ones that were added. */
 
 /* If this is a system filter, read the identify of any original header lines
 that were removed, and then read data for any new ones that were added. */
 

-if (system_filtering)
+if (f.system_filtering)

   {
   int hn = 0;
   header_line *h = header_list;
   {
   int hn = 0;
   header_line *h = header_list;


@@ -889,9 +876,13 @@ if (yield == FF_DELIVERED || yield == FF_NOTDELIVERED ||
 
     /* Next comes the mode and the flags fields */
 
 
     /* Next comes the mode and the flags fields */
 

-    if (read(fd, &(addr->mode), sizeof(addr->mode)) != sizeof(addr->mode) ||
-        read(fd, &(addr->flags), sizeof(addr->flags)) != sizeof(addr->flags) ||
-        !rda_read_string(fd, &(addr->prop.errors_address))) goto DISASTER;
+    if (  read(fd, &addr->mode, sizeof(addr->mode)) != sizeof(addr->mode)
+       || read(fd, &addr->flags, sizeof(addr->flags)) != sizeof(addr->flags)
+       || !rda_read_string(fd, &addr->prop.errors_address)
+       || read(fd, &i, sizeof(i)) != sizeof(i)
+       )
+      goto DISASTER;
+    addr->prop.ignore_error = (i != 0);

 
     /* Next comes a possible setting for $thisaddress and any numerical
     variables for pipe expansion, terminated by a NULL string. The maximum
 
     /* Next comes a possible setting for $thisaddress and any numerical
     variables for pipe expansion, terminated by a NULL string. The maximum