Set mainlog_name and rejectlog_name unconditionally.

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

diff --git a/src/src/log.c b/src/src/log.c
index 89c5dc0030b8857e1aed31489eb7c94208d34e65..2cf578069d780002d56b9a2a0d18122f77113e90 100644 (file)
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */

+/* Copyright (c) The Exim Maintainers 2020 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for writing log files. The code for maintaining datestamped
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for writing log files. The code for maintaining datestamped


@@ -104,7 +105,8 @@ static const uschar * exim_errstrings[] = {
   US"Negotiation failed for proxy configured host",
   US"Authenticator 'other' failure",
   US"target not supporting SMTPUTF8",
   US"Negotiation failed for proxy configured host",
   US"Authenticator 'other' failure",
   US"target not supporting SMTPUTF8",

-  US"",
+  US"host is local",
+  US"tainted filename",

 
   US"Not time for routing",
   US"Not time for local delivery",
 
   US"Not time for routing",
   US"Not time for local delivery",


@@ -242,7 +244,7 @@ if (s1)
   }
 if (f.receive_call_bombout) receive_bomb_out(NULL, s2);  /* does not return */
 if (smtp_input) smtp_closedown(s2);
   }
 if (f.receive_call_bombout) receive_bomb_out(NULL, s2);  /* does not return */
 if (smtp_input) smtp_closedown(s2);

-exim_exit(EXIT_FAILURE, NULL);
+exim_exit(EXIT_FAILURE);

 }
 
 
 }
 
 


@@ -313,7 +315,7 @@ Returns:       a file descriptor, or < 0 on failure (errno set)
 int
 log_create_as_exim(uschar *name)
 {
 int
 log_create_as_exim(uschar *name)
 {

-pid_t pid = exim_fork(US"logfile create");
+pid_t pid = exim_fork(US"logfile-create");

 int status = 1;
 int fd = -1;
 
 int status = 1;
 int fd = -1;
 


@@ -401,18 +403,20 @@ it gets statted to see if it has been cycled. With a datestamp, the datestamp
 will be compared. The static slot for saving it is the same size as buffer,
 and the text has been checked above to fit, so this use of strcpy() is OK. */
 
 will be compared. The static slot for saving it is the same size as buffer,
 and the text has been checked above to fit, so this use of strcpy() is OK. */
 

-if (type == lt_main && string_datestamp_offset >= 0)
+if (type == lt_main)

   {
   Ustrcpy(mainlog_name, buffer);
   {
   Ustrcpy(mainlog_name, buffer);

-  mainlog_datestamp = mainlog_name + string_datestamp_offset;
+  if (string_datestamp_offset > 0)
+    mainlog_datestamp = mainlog_name + string_datestamp_offset;

   }
 
 /* Ditto for the reject log */
 
   }
 
 /* Ditto for the reject log */
 

-else if (type == lt_reject && string_datestamp_offset >= 0)
+else if (type == lt_reject)

   {
   Ustrcpy(rejectlog_name, buffer);
   {
   Ustrcpy(rejectlog_name, buffer);

-  rejectlog_datestamp = rejectlog_name + string_datestamp_offset;
+  if (string_datestamp_offset > 0)
+    rejectlog_datestamp = rejectlog_name + string_datestamp_offset;

   }
 
 /* and deal with the debug log (which keeps the datestamp, but does not
   }
 
 /* and deal with the debug log (which keeps the datestamp, but does not


@@ -767,7 +771,7 @@ if (!log_buffer)
   if (!(log_buffer = US malloc(LOG_BUFFER_SIZE)))
     {
     fprintf(stderr, "exim: failed to get store for log buffer\n");
   if (!(log_buffer = US malloc(LOG_BUFFER_SIZE)))
     {
     fprintf(stderr, "exim: failed to get store for log buffer\n");

-    exim_exit(EXIT_FAILURE, NULL);
+    exim_exit(EXIT_FAILURE);

     }
 
 /* If we haven't already done so, inspect the setting of log_file_path to
     }
 
 /* If we haven't already done so, inspect the setting of log_file_path to


@@ -983,7 +987,7 @@ if (!f.really_exim || f.log_testing_mode)
     else
       fprintf(log_stderr, "%s", CS log_buffer);
 
     else
       fprintf(log_stderr, "%s", CS log_buffer);
 

-  if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE, US"");
+  if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE);

   return;
   }
 
   return;
   }
 


@@ -1187,10 +1191,7 @@ if (flags & LOG_PANIC)
     panic_recurseflag = FALSE;
 
     if (panic_save_buffer)
     panic_recurseflag = FALSE;
 
     if (panic_save_buffer)

-      {
-      int i = write(paniclogfd, panic_save_buffer, Ustrlen(panic_save_buffer));
-      i = i;   /* compiler quietening */
-      }
+      (void) write(paniclogfd, panic_save_buffer, Ustrlen(panic_save_buffer));

 
     written_len = write_to_fd_buf(paniclogfd, g->s, g->ptr);
     if (written_len != g->ptr)
 
     written_len = write_to_fd_buf(paniclogfd, g->s, g->ptr);
     if (written_len != g->ptr)


@@ -1298,14 +1299,14 @@ decode_bits(unsigned int *selector, size_t selsize, int *notall,
   uschar *string, bit_table *options, int count, uschar *which, int flags)
 {
 uschar *errmsg;
   uschar *string, bit_table *options, int count, uschar *which, int flags)
 {
 uschar *errmsg;

-if (string == NULL) return;
+if (!string) return;

 
 if (*string == '=')
   {
   char *end;    /* Not uschar */
   memset(selector, 0, sizeof(*selector)*selsize);
   *selector = strtoul(CS string+1, &end, 0);
 
 if (*string == '=')
   {
   char *end;    /* Not uschar */
   memset(selector, 0, sizeof(*selector)*selsize);
   *selector = strtoul(CS string+1, &end, 0);

-  if (*end == 0) return;
+  if (!*end) return;

   errmsg = string_sprintf("malformed numeric %s_selector setting: %s", which,
     string);
   goto ERROR_RETURN;
   errmsg = string_sprintf("malformed numeric %s_selector setting: %s", which,
     string);
   goto ERROR_RETURN;


@@ -1320,8 +1321,8 @@ else for(;;)
   int len;
   bit_table *start, *end;
 
   int len;
   bit_table *start, *end;
 

-  while (isspace(*string)) string++;
-  if (*string == 0) return;
+  Uskip_whitespace(&string);
+  if (!*string) return;

 
   if (*string != '+' && *string != '-')
     {
 
   if (*string != '+' && *string != '-')
     {


@@ -1343,7 +1344,6 @@ else for(;;)
     bit_table *middle = start + (end - start)/2;
     int c = Ustrncmp(s, middle->name, len);
     if (c == 0)
     bit_table *middle = start + (end - start)/2;
     int c = Ustrncmp(s, middle->name, len);
     if (c == 0)

-      {

       if (middle->name[len] != 0) c = -1; else
         {
         unsigned int bit = middle->bit;
       if (middle->name[len] != 0) c = -1; else
         {
         unsigned int bit = middle->bit;


@@ -1365,7 +1365,6 @@ else for(;;)
 
         break;  /* Out of loop to match selector name */
         }
 
         break;  /* Out of loop to match selector name */
         }

-      }

     if (c < 0) end = middle; else start = middle + 1;
     }  /* Loop to match selector name */
 
     if (c < 0) end = middle; else start = middle + 1;
     }  /* Loop to match selector name */