X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/e498ab40197936833f696439e78c5cb08e5180cb..ce93c6d840d56b3cd7b2ced65c4e96820040c8a7:/src/src/log.c diff --git a/src/src/log.c b/src/src/log.c index b01a179c0..db82925e5 100644 --- a/src/src/log.c +++ b/src/src/log.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2016 */ +/* Copyright (c) University of Cambridge 1995 - 2017 */ /* See the file NOTICE for conditions of use and distribution. */ /* Functions for writing log files. The code for maintaining datestamped @@ -47,6 +47,8 @@ static BOOL path_inspected = FALSE; static int logging_mode = LOG_MODE_FILE; static uschar *file_path = US""; +static size_t pid_position[2]; + /* These should be kept in-step with the private delivery error number definitions in macros.h */ @@ -117,7 +119,7 @@ static const uschar * exim_errstrings[] = { const uschar * exim_errstr(int err) { -return errno < 0 ? exim_errstrings[-err] : CUS strerror(err); +return err < 0 ? exim_errstrings[-err] : CUS strerror(err); } /************************************************* @@ -132,7 +134,7 @@ can get here if there is a failure to open the panic log.) Arguments: priority syslog priority - s the string to be written + s the string to be written, the string may be modified! Returns: nothing */ @@ -145,7 +147,9 @@ int linecount = 0; if (running_in_test_harness) return; -if (!syslog_timestamp) s += log_timezone? 26 : 20; +if (!syslog_timestamp) s += log_timezone ? 26 : 20; +if (!syslog_pid && LOGGING(pid)) + memmove(s + pid_position[0], s + pid_position[1], pid_position[1] - pid_position[0]); len = Ustrlen(s); @@ -219,16 +223,16 @@ Returns: The function does not return static void die(uschar *s1, uschar *s2) { -if (s1 != NULL) +if (s1) { write_syslog(LOG_CRIT, s1); - if (debug_file != NULL) debug_printf("%s\n", s1); + if (debug_file) debug_printf("%s\n", s1); if (log_stderr != NULL && log_stderr != debug_file) fprintf(log_stderr, "%s\n", s1); } if (receive_call_bombout) receive_bomb_out(NULL, s2); /* does not return */ if (smtp_input) smtp_closedown(s2); -exim_exit(EXIT_FAILURE); +exim_exit(EXIT_FAILURE, NULL); } @@ -252,7 +256,11 @@ Returns: a file descriptor, or < 0 on failure (errno set) int log_create(uschar *name) { -int fd = Uopen(name, O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); +int fd = Uopen(name, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); /* If creation failed, attempt to build a log directory in case that is the problem. */ @@ -264,9 +272,13 @@ if (fd < 0 && errno == ENOENT) *lastslash = 0; created = directory_make(NULL, name, LOG_DIRECTORY_MODE, FALSE); DEBUG(D_any) debug_printf("%s log directory %s\n", - created? "created" : "failed to create", name); + created ? "created" : "failed to create", name); *lastslash = '/'; - if (created) fd = Uopen(name, O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); + if (created) fd = Uopen(name, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_CREAT|O_APPEND|O_WRONLY, LOG_MODE); } return fd; @@ -316,7 +328,11 @@ if (pid == 0) /* If we created a subprocess, wait for it. If it succeeded, try the open. */ while (pid > 0 && waitpid(pid, &status, 0) != pid); -if (status == 0) fd = Uopen(name, O_APPEND|O_WRONLY, LOG_MODE); +if (status == 0) fd = Uopen(name, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_APPEND|O_WRONLY, LOG_MODE); /* If we failed to create a subprocess, we are in a bad way. We return with fd still < 0, and errno set, letting the caller handle the error. */ @@ -375,7 +391,7 @@ 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. */ -if (type == lt_main) +if (type == lt_main && string_datestamp_offset >= 0) { Ustrcpy(mainlog_name, buffer); mainlog_datestamp = mainlog_name + string_datestamp_offset; @@ -383,7 +399,7 @@ if (type == lt_main) /* Ditto for the reject log */ -else if (type == lt_reject) +else if (type == lt_reject && string_datestamp_offset >= 0) { Ustrcpy(rejectlog_name, buffer); rejectlog_datestamp = rejectlog_name + string_datestamp_offset; @@ -430,19 +446,23 @@ else if (string_datestamp_offset >= 0) /* If the file name is too long, it is an unrecoverable disaster */ if (!ok) - { die(US"exim: log file path too long: aborting", US"Logging failure; please try later"); - } /* We now have the file name. Try to open an existing file. After a successful open, arrange for automatic closure on exec(), and then return. */ -*fd = Uopen(buffer, O_APPEND|O_WRONLY, LOG_MODE); +*fd = Uopen(buffer, +#ifdef O_CLOEXEC + O_CLOEXEC | +#endif + O_APPEND|O_WRONLY, LOG_MODE); if (*fd >= 0) { +#ifndef O_CLOEXEC (void)fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC); +#endif return; } @@ -469,7 +489,9 @@ else if (euid == root_uid) *fd = log_create_as_exim(buffer); if (*fd >= 0) { +#ifndef O_CLOEXEC (void)fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC); +#endif return; } @@ -490,12 +512,9 @@ log. If possible, save a copy of the original line that was being logged. If we are recursing (can't open the panic log either), the pointer will already be set. */ -if (panic_save_buffer == NULL) - { - panic_save_buffer = (uschar *)malloc(LOG_BUFFER_SIZE); - if (panic_save_buffer != NULL) +if (!panic_save_buffer) + if ((panic_save_buffer = US malloc(LOG_BUFFER_SIZE))) memcpy(panic_save_buffer, log_buffer, LOG_BUFFER_SIZE); - } log_write(0, LOG_PANIC_DIE, "Cannot open %s log file \"%s\": %s: " "euid=%d egid=%d", log_names[type], buffer, strerror(errno), euid, getegid()); @@ -538,10 +557,7 @@ if ((flags & (LOG_CONFIG_FOR & ~LOG_CONFIG)) != 0) } if ((flags & (LOG_CONFIG_IN & ~LOG_CONFIG)) != 0) - { - sprintf(CS ptr, " in line %d of %s", config_lineno, config_filename); - while (*ptr) ptr++; - } + ptr += sprintf(CS ptr, " in line %d of %s", config_lineno, config_filename); Ustrcpy(ptr, ":\n "); return ptr + 4; @@ -575,12 +591,9 @@ log_write_failed(uschar *name, int length, int rc) { int save_errno = errno; -if (panic_save_buffer == NULL) - { - panic_save_buffer = (uschar *)malloc(LOG_BUFFER_SIZE); - if (panic_save_buffer != NULL) +if (!panic_save_buffer) + if ((panic_save_buffer = US malloc(LOG_BUFFER_SIZE))) memcpy(panic_save_buffer, log_buffer, LOG_BUFFER_SIZE); - } log_write(0, LOG_PANIC_DIE, "failed to write to %s: length=%d result=%d " "errno=%d (%s)", name, length, rc, save_errno, @@ -649,6 +662,14 @@ while ((t = string_nextinlist(&tt, &sep, log_buffer, LOG_BUFFER_SIZE))) } +void +mainlog_close(void) +{ +if (mainlogfd < 0) return; +(void)close(mainlogfd); +mainlogfd = -1; +mainlog_inode = 0; +} /************************************************* * Write message to log file * @@ -678,7 +699,7 @@ If it is not, don't try to write to the log because permission will probably be denied. Avoid actually writing to the logs when exim is called with -bv or -bt to -test an address, but take other actions, such as panicing. +test an address, but take other actions, such as panicking. In Exim proper, the buffer for building the message is got at start-up, so that nothing gets done if it can't be got. However, some functions that are also @@ -710,7 +731,7 @@ Returns: nothing void log_write(unsigned int selector, int flags, const char *format, ...) { -uschar *ptr; +uschar * ptr; int length; int paniclogfd; ssize_t written_len; @@ -736,15 +757,12 @@ if (panic_recurseflag) /* Ensure we have a buffer (see comment above); this should never be obeyed when running Exim proper, only when running utilities. */ -if (log_buffer == NULL) - { - log_buffer = (uschar *)malloc(LOG_BUFFER_SIZE); - if (log_buffer == NULL) +if (!log_buffer) + if (!(log_buffer = US malloc(LOG_BUFFER_SIZE))) { fprintf(stderr, "exim: failed to get store for log buffer\n"); - exim_exit(EXIT_FAILURE); + exim_exit(EXIT_FAILURE, NULL); } - } /* If we haven't already done so, inspect the setting of log_file_path to determine whether to log to files and/or to syslog. Bits in logging_mode @@ -839,13 +857,12 @@ DEBUG(D_any|D_v) } } - sprintf(CS ptr, "%s%s%s%s\n ", + ptr += sprintf(CS ptr, "%s%s%s%s\n ", ((flags & LOG_MAIN) != 0)? " MAIN" : "", ((flags & LOG_PANIC) != 0)? " PANIC" : "", ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE)? " DIE" : "", ((flags & LOG_REJECT) != 0)? " REJECT" : ""); - while(*ptr) ptr++; if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags); va_start(ap, format); @@ -880,20 +897,17 @@ if (!write_rejectlog) flags &= ~LOG_REJECT; when called by a utility. */ ptr = log_buffer; -sprintf(CS ptr, "%s ", tod_stamp(tod_log)); -while(*ptr) ptr++; +ptr += sprintf(CS ptr, "%s ", tod_stamp(tod_log)); if (LOGGING(pid)) { - sprintf(CS ptr, "[%d] ", (int)getpid()); - while (*ptr) ptr++; + if (!syslog_pid) pid_position[0] = ptr - log_buffer; /* remember begin … */ + ptr += sprintf(CS ptr, "[%d] ", (int)getpid()); + if (!syslog_pid) pid_position[1] = ptr - log_buffer; /* … and end+1 of the PID */ } if (really_exim && message_id[0] != 0) - { - sprintf(CS ptr, "%s ", message_id); - while(*ptr) ptr++; - } + ptr += sprintf(CS ptr, "%s ", message_id); if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags); @@ -908,10 +922,7 @@ this way because it kind of fits with LOG_RECIPIENTS. */ if ((flags & LOG_SENDER) != 0 && ptr < log_buffer + LOG_BUFFER_SIZE - 10 - Ustrlen(raw_sender)) - { - sprintf(CS ptr, " from <%s>", raw_sender); - while (*ptr) ptr++; - } + ptr += sprintf(CS ptr, " from <%s>", raw_sender); /* Add list of recipients to the message if required; the raw list, before rewriting, was saved in raw_recipients. There may be none, if an ACL @@ -921,19 +932,16 @@ if ((flags & LOG_RECIPIENTS) != 0 && ptr < log_buffer + LOG_BUFFER_SIZE - 6 && raw_recipients_count > 0) { int i; - sprintf(CS ptr, " for"); - while (*ptr) ptr++; + ptr += sprintf(CS ptr, " for"); for (i = 0; i < raw_recipients_count; i++) { - uschar *s = raw_recipients[i]; + uschar * s = raw_recipients[i]; if (log_buffer + LOG_BUFFER_SIZE - ptr < Ustrlen(s) + 3) break; - sprintf(CS ptr, " %s", s); - while (*ptr) ptr++; + ptr += sprintf(CS ptr, " %s", s); } } -sprintf(CS ptr, "\n"); -while(*ptr) ptr++; +ptr += sprintf(CS ptr, "\n"); length = ptr - log_buffer; /* Handle loggable errors when running a utility, or when address testing. @@ -950,7 +958,7 @@ if (!really_exim || log_testing_mode) else fprintf(log_stderr, "%s", CS log_buffer); } - if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE); + if ((flags & LOG_PANIC_DIE) == LOG_PANIC_DIE) exim_exit(EXIT_FAILURE, US""); return; } @@ -960,14 +968,14 @@ been opened, but we don't want to keep on writing to it for too long after it has been renamed. Therefore, do a stat() and see if the inode has changed, and if so, re-open. */ -if ((flags & LOG_MAIN) != 0 && - (selector == 0 || (selector & log_selector[0]) != 0)) +if ( flags & LOG_MAIN + && (!selector || selector & log_selector[0])) { - if ((logging_mode & LOG_MODE_SYSLOG) != 0 && - (syslog_duplication || (flags & (LOG_REJECT|LOG_PANIC)) == 0)) + if ( logging_mode & LOG_MODE_SYSLOG + && (syslog_duplication || !(flags & (LOG_REJECT|LOG_PANIC)))) write_syslog(LOG_INFO, log_buffer); - if ((logging_mode & LOG_MODE_FILE) != 0) + if (logging_mode & LOG_MODE_FILE) { struct stat statbuf; @@ -975,7 +983,7 @@ if ((flags & LOG_MAIN) != 0 && operation. This happens at midnight, at which point we want to roll over the file. Closing it has the desired effect. */ - if (mainlog_datestamp != NULL) + if (mainlog_datestamp) { uschar *nowstamp = tod_stamp(string_datestamp_type); if (Ustrncmp (mainlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0) @@ -993,14 +1001,8 @@ if ((flags & LOG_MAIN) != 0 && happening. */ if (mainlogfd >= 0) - { if (Ustat(mainlog_name, &statbuf) < 0 || statbuf.st_ino != mainlog_inode) - { - (void)close(mainlogfd); - mainlogfd = -1; - mainlog_inode = 0; - } - } + mainlog_close(); /* If the log is closed, open it. Then write the line. */ @@ -1065,11 +1067,9 @@ if ((flags & LOG_REJECT) != 0) /* A header with a NULL text is an unfilled in Received: header */ - for (h = header_list; h != NULL; h = h->next) + for (h = header_list; h; h = h->next) if (h->text) { - BOOL fitted; - if (h->text == NULL) continue; - fitted = string_format(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer), + BOOL fitted = string_format(ptr, LOG_BUFFER_SIZE - (ptr-log_buffer), "%c %s", h->type, h->text); while(*ptr) ptr++; if (!fitted) /* Buffer is full; truncate */ @@ -1099,7 +1099,7 @@ if ((flags & LOG_REJECT) != 0) { struct stat statbuf; - if (rejectlog_datestamp != NULL) + if (rejectlog_datestamp) { uschar *nowstamp = tod_stamp(string_datestamp_type); if (Ustrncmp (rejectlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0) @@ -1156,9 +1156,7 @@ if ((flags & LOG_PANIC) != 0) fprintf(log_stderr, "%s", CS log_buffer); if ((logging_mode & LOG_MODE_SYSLOG) != 0) - { write_syslog(LOG_ALERT, log_buffer); - } /* If this panic logging was caused by a failure to open the main log, the original log line is in panic_save_buffer. Make an attempt to write it. */