* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2023 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Functions for writing log files. The code for maintaining datestamped
log files was originally contributed by Tony Sheen. */
#include "exim.h"
-#define LOG_NAME_SIZE 256
#define MAX_SYSLOG_LEN 870
#define LOG_MODE_FILE 1
static uschar mainlog_name[LOG_NAME_SIZE];
static uschar rejectlog_name[LOG_NAME_SIZE];
-static uschar debuglog_name[LOG_NAME_SIZE];
static uschar *mainlog_datestamp = NULL;
static uschar *rejectlog_datestamp = NULL;
number definitions in macros.h */
static const uschar * exim_errstrings[] = {
- US"",
- US"unknown error",
- US"user slash",
- US"exist race",
- US"not regular",
- US"not directory",
- US"bad ugid",
- US"bad mode",
- US"inode changed",
- US"lock failed",
- US"bad address2",
- US"forbid pipe",
- US"forbid file",
- US"forbid reply",
- US"missing pipe",
- US"missing file",
- US"missing reply",
- US"bad redirect",
- US"smtp closed",
- US"smtp format",
- US"spool format",
- US"not absolute",
- US"Exim-imposed quota",
- US"held",
- US"Delivery filter process failure",
- US"Delivery add/remove header failure",
- US"Delivery write incomplete error",
- US"Some expansion failed",
- US"Failed to get gid",
- US"Failed to get uid",
- US"Unset or non-existent transport",
- US"MBX length mismatch",
- US"Lookup failed routing or in smtp tpt",
- US"Can't match format in appendfile",
- US"Creation outside home in appendfile",
- US"Can't check a list; lookup defer",
- US"DNS lookup defer",
- US"Failed to start TLS session",
- US"Mandatory TLS session not started",
- US"Failed to chown a file",
- US"Failed to create a pipe",
- US"When verifying",
- US"When required by client",
- US"Used internally in smtp transport",
- US"RCPT gave 4xx error",
- US"MAIL gave 4xx error",
- US"DATA gave 4xx error",
- US"Negotiation failed for proxy configured host",
- US"Authenticator 'other' failure",
- US"target not supporting SMTPUTF8",
- US"host is local",
- US"tainted filename",
-
- US"Not time for routing",
- US"Not time for local delivery",
- US"Not time for any remote host",
- US"Local-only delivery",
- US"Domain in queue_domains",
- US"Transport concurrency limit",
- US"Event requests alternate response",
+ [0] = US"",
+ [- ERRNO_UNKNOWNERROR] = US"unknown error",
+ [- ERRNO_USERSLASH] = US"user slash",
+ [- ERRNO_EXISTRACE] = US"exist race",
+ [- ERRNO_NOTREGULAR] = US"not regular",
+ [- ERRNO_NOTDIRECTORY] = US"not directory",
+ [- ERRNO_BADUGID] = US"bad ugid",
+ [- ERRNO_BADMODE] = US"bad mode",
+ [- ERRNO_INODECHANGED] = US"inode changed",
+ [- ERRNO_LOCKFAILED] = US"lock failed",
+ [- ERRNO_BADADDRESS2] = US"bad address2",
+ [- ERRNO_FORBIDPIPE] = US"forbid pipe",
+ [- ERRNO_FORBIDFILE] = US"forbid file",
+ [- ERRNO_FORBIDREPLY] = US"forbid reply",
+ [- ERRNO_MISSINGPIPE] = US"missing pipe",
+ [- ERRNO_MISSINGFILE] = US"missing file",
+ [- ERRNO_MISSINGREPLY] = US"missing reply",
+ [- ERRNO_BADREDIRECT] = US"bad redirect",
+ [- ERRNO_SMTPCLOSED] = US"smtp closed",
+ [- ERRNO_SMTPFORMAT] = US"smtp format",
+ [- ERRNO_SPOOLFORMAT] = US"spool format",
+ [- ERRNO_NOTABSOLUTE] = US"not absolute",
+ [- ERRNO_EXIMQUOTA] = US"Exim-imposed quota",
+ [- ERRNO_HELD] = US"held",
+ [- ERRNO_FILTER_FAIL] = US"Delivery filter process failure",
+ [- ERRNO_CHHEADER_FAIL] = US"Delivery add/remove header failure",
+ [- ERRNO_WRITEINCOMPLETE] = US"Delivery write incomplete error",
+ [- ERRNO_EXPANDFAIL] = US"Some expansion failed",
+ [- ERRNO_GIDFAIL] = US"Failed to get gid",
+ [- ERRNO_UIDFAIL] = US"Failed to get uid",
+ [- ERRNO_BADTRANSPORT] = US"Unset or non-existent transport",
+ [- ERRNO_MBXLENGTH] = US"MBX length mismatch",
+ [- ERRNO_UNKNOWNHOST] = US"Lookup failed routing or in smtp tpt",
+ [- ERRNO_FORMATUNKNOWN] = US"Can't match format in appendfile",
+ [- ERRNO_BADCREATE] = US"Creation outside home in appendfile",
+ [- ERRNO_LISTDEFER] = US"Can't check a list; lookup defer",
+ [- ERRNO_DNSDEFER] = US"DNS lookup defer",
+ [- ERRNO_TLSFAILURE] = US"Failed to start TLS session",
+ [- ERRNO_TLSREQUIRED] = US"Mandatory TLS session not started",
+ [- ERRNO_CHOWNFAIL] = US"Failed to chown a file",
+ [- ERRNO_PIPEFAIL] = US"Failed to create a pipe",
+ [- ERRNO_CALLOUTDEFER] = US"When verifying",
+ [- ERRNO_AUTHFAIL] = US"When required by client",
+ [- ERRNO_CONNECTTIMEOUT] = US"Used internally in smtp transport",
+ [- ERRNO_RCPT4XX] = US"RCPT gave 4xx error",
+ [- ERRNO_MAIL4XX] = US"MAIL gave 4xx error",
+ [- ERRNO_DATA4XX] = US"DATA gave 4xx error",
+ [- ERRNO_PROXYFAIL] = US"Negotiation failed for proxy configured host",
+ [- ERRNO_AUTHPROB] = US"Authenticator 'other' failure",
+ [- ERRNO_UTF8_FWD] = US"target not supporting SMTPUTF8",
+ [- ERRNO_HOST_IS_LOCAL] = US"host is local",
+ [- ERRNO_TAINT] = US"tainted filename",
+
+ [- ERRNO_RRETRY] = US"Not time for routing",
+
+ [- ERRNO_LRETRY] = US"Not time for local delivery",
+ [- ERRNO_HRETRY] = US"Not time for any remote host",
+ [- ERRNO_LOCAL_ONLY] = US"Local-only delivery",
+ [- ERRNO_QUEUE_DOMAIN] = US"Domain in queue_domains",
+ [- ERRNO_TRETRY] = US"Transport concurrency limit",
+
+ [- ERRNO_EVENT] = US"Event requests alternate response",
};
*/
static int
-log_open_already_exim(uschar * const name)
+log_open_already_exim(const uschar * const name)
{
int fd = -1;
const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NONBLOCK;
*/
int
-log_open_as_exim(uschar * const name)
+log_open_as_exim(const uschar * const name)
{
int fd = -1;
const uid_t euid = geteuid();
*/
static void
-open_log(int *fd, int type, uschar *tag)
+open_log(int * fd, int type, const uschar * tag)
{
uid_t euid;
BOOL ok, ok2;
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. */
-
Ustrcpy(mainlog_name, buffer);
if (string_datestamp_offset > 0)
mainlog_datestamp = mainlog_name + string_datestamp_offset;
case lt_reject:
/* Ditto for the reject log */
-
Ustrcpy(rejectlog_name, buffer);
if (string_datestamp_offset > 0)
rejectlog_datestamp = rejectlog_name + string_datestamp_offset;
case lt_debug:
/* and deal with the debug log (which keeps the datestamp, but does not
update it) */
-
Ustrcpy(debuglog_name, buffer);
if (tag)
{
if (is_tainted(tag))
- die(US"exim: tainted tag for debug log filename",
- US"Logging failure; please try later");
+ die(US"exim: tainted tag for debug log filename",
+ US"Logging failure; please try later");
/* this won't change the offset of the datestamp */
ok2 = string_format(buffer, sizeof(buffer), "%s%s",
default:
/* Remove any datestamp if this is the panic log. This is rare, so there's no
- need to optimize getting the datestamp length. We remove one non-alphanumeric
- char afterwards if at the start, otherwise one before. */
-
+ need to optimize getting the datestamp length. We remove one non-alphanumeric
+ char afterwards if at the start, otherwise one before. */
if (string_datestamp_offset >= 0)
{
uschar * from = buffer + string_datestamp_offset;
+/* Append to a gstring, in no-extend (or rebuffer) mode
+and without taint-checking. Thanks to the no-extend, the
+gstring struct never needs reallocation; we ignore the
+infore that the initial space allocation for the string
+was exceeded, and just leave it potentially truncated. */
+
+static void
+string_fmt_append_noextend(gstring * g, char * fmt, ...)
+{
+va_list ap;
+va_start(ap, fmt);
+/* can return NULL if it truncates; just ignore */
+(void) string_vformat(g, SVFMT_TAINT_NOCHK, fmt, ap);
+va_end(ap);
+}
+
/*************************************************
* Add configuration file info to log line *
*************************************************/
once for real).
Arguments:
- ptr pointer to the end of the line we are building
- flags log flags
+ g extensible-string referring to static buffer,
+ usable after return
+ flags log flags
-Returns: updated pointer
+Returns: nothing
*/
-static gstring *
+static void
log_config_info(gstring * g, int flags)
{
-g = string_cat(g, US"Exim configuration error");
+string_fmt_append_noextend(g, "Exim configuration error");
if (flags & (LOG_CONFIG_FOR & ~LOG_CONFIG))
- return string_cat(g, US" for ");
-
-if (flags & (LOG_CONFIG_IN & ~LOG_CONFIG))
- g = string_fmt_append(g, " in line %d of %s", config_lineno, config_filename);
+ string_fmt_append_noextend(g, " for ");
+else
+ {
+ if (flags & (LOG_CONFIG_IN & ~LOG_CONFIG))
+ string_fmt_append_noextend(g, " in line %d of %s",
+ config_lineno, config_filename);
-return string_catn(g, US":\n ", 4);
+ string_fmt_append_noextend(g, ":\n ");
+ }
}
length actually written, persisting an errno from write()
*/
ssize_t
-write_to_fd_buf(int fd, const uschar *buf, size_t length)
+write_to_fd_buf(int fd, const uschar * buf, size_t length)
{
ssize_t wrote;
size_t total_written = 0;
-const uschar *p = buf;
+const uschar * p = buf;
size_t left = length;
while (1)
return total_written;
}
-
-/* Pull the file out of the configured or the compiled-in list.
-Called for an empty log_file_path element, for debug logging activation
-when file_path has not previously been set, and from the appenfile transport setup. */
-
-void
-set_file_path(BOOL *multiple)
+static inline ssize_t
+write_gstring_to_fd_buf(int fd, const gstring * g)
{
-uschar *s;
-int sep = ':'; /* Fixed separator - outside use */
-const uschar *ss = *log_file_path ? log_file_path : US LOG_FILE_PATH;
+return write_to_fd_buf(fd, g->s, g->ptr);
+}
-if (*ss)
- for (logging_mode = 0;
- s = string_nextinlist(&ss, &sep, log_buffer, LOG_BUFFER_SIZE); )
- {
- if (Ustrcmp(s, "syslog") == 0)
- logging_mode |= LOG_MODE_SYSLOG;
- else if (!(logging_mode & LOG_MODE_FILE)) /* no file yet */
- {
- logging_mode |= LOG_MODE_FILE;
- if (*s) file_path = string_copy(s); /* If a non-empty path is given, use it */
- }
- else if (multiple) *multiple = TRUE;
- }
-else
- logging_mode = LOG_MODE_FILE;
-/* Set up the ultimate default if necessary. */
-if (logging_mode & LOG_MODE_FILE && !*file_path)
- if (LOG_FILE_PATH[0])
- {
- /* If we still do not have a file_path, we take
- the first non-empty, non-syslog item in LOG_FILE_PATH, if there is
- one. If there is no such item, use the ultimate default in the
- spool directory. */
-
- for (ss = US LOG_FILE_PATH;
- s = string_nextinlist(&ss, &sep, log_buffer, LOG_BUFFER_SIZE);)
- {
- if (*s != '/') continue;
- file_path = string_copy(s);
- }
- }
- else file_path = string_sprintf("%s/log/%%slog", spool_directory);
+static void
+set_file_path(void)
+{
+int sep = ':'; /* Fixed separator - outside use */
+uschar *t;
+const uschar *tt = US LOG_FILE_PATH;
+while ((t = string_nextinlist(&tt, &sep, log_buffer, LOG_BUFFER_SIZE)))
+ {
+ if (Ustrcmp(t, "syslog") == 0 || t[0] == 0) continue;
+ file_path = string_copy(t);
+ break;
+ }
}
+/* Close mainlog, unless we do not see a chance to open the file mainlog later
+again. This will happen if we log from a transport process (which has dropped
+privs); something we traditionally avoid, but the introduction of taint-tracking
+and resulting detection of errors is makinng harder. */
+
void
mainlog_close(void)
{
-/* avoid closing it if it is closed already or if we do not see a chance
-to open the file mainlog later again */
-if (mainlogfd < 0 /* already closed */
+if (mainlogfd < 0
|| !(geteuid() == 0 || geteuid() == exim_uid))
return;
(void)close(mainlogfd);
{
int paniclogfd;
ssize_t written_len;
-gstring gs = { .size = LOG_BUFFER_SIZE-1, .ptr = 0, .s = log_buffer };
-gstring * g;
+gstring gs = { .size = LOG_BUFFER_SIZE-2, .ptr = 0, .s = log_buffer };
+gstring * g = &gs;
va_list ap;
/* If panic_recurseflag is set, we have failed to open the panic log. This is
if (panic_recurseflag)
{
- uschar *extra = panic_save_buffer ? panic_save_buffer : US"";
+ uschar * extra = panic_save_buffer ? panic_save_buffer : US"";
if (debug_file) debug_printf("%s%s", extra, log_buffer);
if (log_stderr && log_stderr != debug_file)
fprintf(log_stderr, "%s%s", extra, log_buffer);
store_pool = POOL_PERM;
- /* make sure that we have a valid log file path in "file_path",
- the open_log() later relies on it */
- set_file_path(&multiple);
+ /* If nothing has been set, don't waste effort... the default values for the
+ statics are file_path="" and logging_mode = LOG_MODE_FILE. */
+
+ if (*log_file_path)
+ {
+ int sep = ':'; /* Fixed separator - outside use */
+ uschar *s;
+ const uschar *ss = log_file_path;
+
+ logging_mode = 0;
+ while ((s = string_nextinlist(&ss, &sep, log_buffer, LOG_BUFFER_SIZE)))
+ {
+ if (Ustrcmp(s, "syslog") == 0)
+ logging_mode |= LOG_MODE_SYSLOG;
+ else if (logging_mode & LOG_MODE_FILE)
+ multiple = TRUE;
+ else
+ {
+ logging_mode |= LOG_MODE_FILE;
+
+ /* If a non-empty path is given, use it */
+
+ if (*s)
+ file_path = string_copy(s);
+
+ /* If the path is empty, we want to use the first non-empty, non-
+ syslog item in LOG_FILE_PATH, if there is one, since the value of
+ log_file_path may have been set at runtime. If there is no such item,
+ use the ultimate default in the spool directory. */
+
+ else
+ set_file_path(); /* Empty item in log_file_path */
+ } /* First non-syslog item in log_file_path */
+ } /* Scan of log_file_path */
+ }
/* If no modes have been selected, it is a major disaster */
die(US"Neither syslog nor file logging set in log_file_path",
US"Unexpected logging failure");
- /* Revert to the old store pool, and record that we've sorted out the path. */
+ /* Set up the ultimate default if necessary. Then revert to the old store
+ pool, and record that we've sorted out the path. */
+ if (logging_mode & LOG_MODE_FILE && !file_path[0])
+ file_path = string_sprintf("%s/log/%%slog", spool_directory);
store_pool = old_pool;
path_inspected = TRUE;
DEBUG(D_any|D_v)
{
- int i;
-
- g = string_catn(&gs, US"LOG:", 4);
+ string_fmt_append_noextend(g, "LOG:");
/* Show the selector that was passed into the call. */
- for (i = 0; i < log_options_count; i++)
+ for (int i = 0; i < log_options_count; i++)
{
unsigned int bitnum = log_options[i].bit;
if (bitnum < BITWORDSIZE && selector == BIT(bitnum))
- g = string_fmt_append(g, " %s", log_options[i].name);
+ string_fmt_append_noextend(g, " %s", log_options[i].name);
}
- g = string_fmt_append(g, "%s%s%s%s\n ",
+ string_fmt_append_noextend(g, "%s%s%s%s\n ",
flags & LOG_MAIN ? " MAIN" : "",
flags & LOG_PANIC ? " PANIC" : "",
(flags & LOG_PANIC_DIE) == LOG_PANIC_DIE ? " DIE" : "",
flags & LOG_REJECT ? " REJECT" : "");
- if (flags & LOG_CONFIG) g = log_config_info(g, flags);
+ if (flags & LOG_CONFIG) log_config_info(g, flags);
/* We want to be able to log tainted info, but log_buffer is directly
malloc'd. So use deliberately taint-nonchecking routines to build into
it, trusting that we will never expand the results. */
va_start(ap, format);
- i = g->ptr;
if (!string_vformat(g, SVFMT_TAINT_NOCHK, format, ap))
{
- g->ptr = i;
- g = string_cat(g, US"**** log string overflowed log buffer ****");
+ uschar * s = US"**** log string overflowed log buffer ****";
+ gstring_trim(g, Ustrlen(s));
+ string_fmt_append_noextend(g, "%s", s);
}
va_end(ap);
- g->size = LOG_BUFFER_SIZE;
- g = string_catn(g, US"\n", 1);
- debug_printf("%s", string_from_gstring(g));
+ debug_printf("%Y\n", g);
+
+ /* Having used the buffer for debug output, reset it for the real use. */
- gs.size = LOG_BUFFER_SIZE-1; /* Having used the buffer for debug output, */
- gs.ptr = 0; /* reset it for the real use. */
- gs.s = log_buffer;
+ gstring_reset(g);
}
/* If no log file is specified, we are in a mess. */
/* Create the main message in the log buffer. Do not include the message id
when called by a utility. */
-g = string_fmt_append(&gs, "%s ", tod_stamp(tod_log));
+string_fmt_append_noextend(&gs, "%s ", tod_stamp(tod_log));
if (LOGGING(pid))
{
if (!syslog_pid) pid_position[0] = g->ptr; /* remember begin … */
- g = string_fmt_append(g, "[%d] ", (int)getpid());
+ string_fmt_append_noextend(g, "[%ld] ", (long)getpid());
if (!syslog_pid) pid_position[1] = g->ptr; /* … and end+1 of the PID */
}
-if (f.really_exim && message_id[0] != 0)
- g = string_fmt_append(g, "%s ", message_id);
+if (f.really_exim && message_id[0])
+ string_fmt_append_noextend(g, "%s ", message_id);
if (flags & LOG_CONFIG)
- g = log_config_info(g, flags);
+ log_config_info(g, flags);
va_start(ap, format);
{
- int i = g->ptr;
-
/* We want to be able to log tainted info, but log_buffer is directly
malloc'd. So use deliberately taint-nonchecking routines to build into
it, trusting that we will never expand the results. */
if (!string_vformat(g, SVFMT_TAINT_NOCHK, format, ap))
{
- g->ptr = i;
- g = string_cat(g, US"**** log string overflowed log buffer ****\n");
+ uschar * s = US"**** log string overflowed log buffer ****\n";
+ gstring_trim(g, Ustrlen(s));
+ string_fmt_append_noextend(g, "%s", s);
}
}
va_end(ap);
/* Add the raw, unrewritten, sender to the message if required. This is done
this way because it kind of fits with LOG_RECIPIENTS. */
-if ( flags & LOG_SENDER
- && g->ptr < LOG_BUFFER_SIZE - 10 - Ustrlen(raw_sender))
- g = string_fmt_append_f(g, SVFMT_TAINT_NOCHK, " from <%s>", raw_sender);
+if (flags & LOG_SENDER)
+ string_fmt_append_noextend(g, " 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
discarded them all. */
-if ( flags & LOG_RECIPIENTS
- && g->ptr < LOG_BUFFER_SIZE - 6
- && raw_recipients_count > 0)
+if (flags & LOG_RECIPIENTS && raw_recipients_count > 0)
{
- int i;
- g = string_fmt_append_f(g, SVFMT_TAINT_NOCHK, " for", NULL);
- for (i = 0; i < raw_recipients_count; i++)
- {
- uschar * s = raw_recipients[i];
- if (LOG_BUFFER_SIZE - g->ptr < Ustrlen(s) + 3) break;
- g = string_fmt_append_f(g, SVFMT_TAINT_NOCHK, " %s", s);
+ string_fmt_append_noextend(g, " for");
+ for (int i = 0; i < raw_recipients_count; i++)
+ if (!string_fmt_append_f(g, SVFMT_TAINT_NOCHK, " %s", raw_recipients[i]))
+ {
+ uschar * s = US"<trunc>";
+ gstring_trim(g, Ustrlen(s));
+ string_fmt_append_noextend(g, "%s", s);
+ break;
}
}
-g = string_catn(g, US"\n", 1);
+/* actual size, now we are placing the newline (and space for NUL) */
+gs.size = LOG_BUFFER_SIZE;
+string_fmt_append_noextend(g, "\n");
string_from_gstring(g);
/* Handle loggable errors when running a utility, or when address testing.
/* Failing to write to the log is disastrous */
- written_len = write_to_fd_buf(mainlogfd, g->s, g->ptr);
- if (written_len != g->ptr)
+ if ((written_len = write_gstring_to_fd_buf(mainlogfd, g)) != g->ptr)
{
log_write_failed(US"main log", g->ptr, written_len);
/* That function does not return */
{
if (header_list && LOGGING(rejected_header))
{
- gstring * g2;
int i;
if (recipients_count > 0)
{
/* List the sender */
- g2 = string_fmt_append_f(g, SVFMT_TAINT_NOCHK,
+ string_fmt_append_noextend(g,
"Envelope-from: <%s>\n", sender_address);
- if (g2) g = g2;
/* List up to 5 recipients */
- g2 = string_fmt_append_f(g, SVFMT_TAINT_NOCHK,
+ string_fmt_append_noextend(g,
"Envelope-to: <%s>\n", recipients_list[0].address);
- if (g2) g = g2;
for (i = 1; i < recipients_count && i < 5; i++)
- {
- g2 = string_fmt_append_f(g, SVFMT_TAINT_NOCHK,
+ string_fmt_append_noextend(g,
" <%s>\n", recipients_list[i].address);
- if (g2) g = g2;
- }
if (i < recipients_count)
- {
- g2 = string_fmt_append_f(g, SVFMT_TAINT_NOCHK, " ...\n", NULL);
- if (g2) g = g2;
- }
+ string_fmt_append_noextend(g, " ...\n", NULL);
}
- /* A header with a NULL text is an unfilled in Received: header */
+ /* A header with a NULL text is an unfilled-in Received: header */
for (header_line * h = header_list; h; h = h->next) if (h->text)
- {
- g2 = string_fmt_append_f(g, SVFMT_TAINT_NOCHK,
- "%c %s", h->type, h->text);
- if (g2)
- g = g2;
- else /* Buffer is full; truncate */
- {
- g->ptr -= 100; /* For message and separator */
- if (g->s[g->ptr-1] == '\n') g->ptr--;
- g = string_cat(g, US"\n*** truncated ***\n");
+ if (!string_fmt_append_f(g, SVFMT_TAINT_NOCHK,
+ "%c %s", h->type, h->text))
+ { /* Buffer is full; truncate */
+ gstring_trim(g, 100); /* space for message and separator */
+ gstring_trim_trailing(g, '\n');
+ string_fmt_append_noextend(g, "\n*** truncated ***\n");
break;
}
- }
}
/* Write to syslog or to a log file */
if (fstat(rejectlogfd, &statbuf) >= 0) rejectlog_inode = statbuf.st_ino;
}
- written_len = write_to_fd_buf(rejectlogfd, g->s, g->ptr);
- if (written_len != g->ptr)
+ if ((written_len = write_gstring_to_fd_buf(rejectlogfd, g)) != g->ptr)
{
log_write_failed(US"reject log", g->ptr, written_len);
/* That function does not return */
if (logging_mode & LOG_MODE_FILE)
{
- if (!*file_path) set_file_path(NULL);
panic_recurseflag = TRUE;
open_log(&paniclogfd, lt_panic, NULL); /* Won't return on failure */
panic_recurseflag = FALSE;
if (panic_save_buffer)
(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)
+ if ((written_len = write_gstring_to_fd_buf(paniclogfd, g)) != g->ptr)
{
int save_errno = errno;
write_syslog(LOG_CRIT, log_buffer);
/* Give up if the DIE flag is set */
if ((flags & LOG_PANIC_DIE) != LOG_PANIC)
- die(NULL, US"Unexpected failure, please try later");
+ if (panic_coredump)
+ kill(getpid(), SIGSEGV); /* deliberate trap */
+ else
+ die(NULL, US"Unexpected failure, please try later");
}
}
*/
void
-decode_bits(unsigned int *selector, size_t selsize, int *notall,
- uschar *string, bit_table *options, int count, uschar *which, int flags)
+decode_bits(unsigned int * selector, size_t selsize, int * notall,
+ const uschar * string, bit_table * options, int count, uschar * which,
+ int flags)
{
uschar *errmsg;
if (!string) return;
{
char *end; /* Not uschar */
memset(selector, 0, sizeof(*selector)*selsize);
- *selector = strtoul(CS string+1, &end, 0);
+ *selector = strtoul(CCS string+1, &end, 0);
if (!*end) return;
errmsg = string_sprintf("malformed numeric %s_selector setting: %s", which,
string);
else for(;;)
{
BOOL adding;
- uschar *s;
+ const uschar * s;
int len;
- bit_table *start, *end;
+ bit_table * start, * end;
Uskip_whitespace(&string);
if (!*string) return;
to pass the name through child_exxec_exim(). */
void
-debug_logging_activate(uschar *tag_name, uschar *opts)
+debug_logging_activate(const uschar * tag_name, const uschar * opts)
{
if (debug_file)
{
resulting in certain setup not having been done. Hack this for now so we
do not segfault; note that nondefault log locations will not work */
-if (!*file_path) set_file_path(NULL);
+if (!*file_path) set_file_path();
open_log(&debug_fd, lt_debug, tag_name);
}
+void
+debug_logging_from_spool(const uschar * filename)
+{
+if (debug_fd < 0)
+ {
+ Ustrncpy(debuglog_name, filename, sizeof(debuglog_name));
+ if ((debug_fd = log_open_as_exim(filename)) >= 0)
+ debug_file = fdopen(debug_fd, "w");
+ DEBUG(D_deliver) debug_printf("debug enabled by spoolfile\n");
+ }
+/*
+else DEBUG(D_deliver)
+ debug_printf("debug already active; ignoring spoolfile '%s'\n", filename);
+*/
+}
+
+
void
debug_logging_stop(BOOL kill)
{
+debug_printf("debug terminated by %s\n", kill ? "kill" : "stop");
debug_pretrigger_discard();
if (!debug_file || !debuglog_name[0]) return;
if (kill) unlink_log(lt_debug);
}
-/* Called from the appendfile transport setup. */
-void
-open_logs(void)
-{
-set_file_path(NULL);
-if (!(logging_mode & LOG_MODE_FILE)) return;
-open_log(&mainlogfd, lt_main, 0);
-open_log(&rejectlogfd, lt_reject, 0);
-}
/* End of log.c */
+/* vi: sw ai sw=2
+*/
git://git.exim.org / exim.git / blobdiff