* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2020 - 2022 */
+/* Copyright (c) The Exim Maintainers 2020 - 2023 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* The main function: entry point, initialization, and high-level control.
/* This function runs a regular expression match, and sets up the pointers to
the matched substrings. The matched strings are copied so the lifetime of
-the subject is not a problem.
+the subject is not a problem. Matched strings will have the same taint status
+as the subject string (this is not a de-taint method, and must not be made so
+given the support for wildcards in REs).
Arguments:
re the compiled expression
if ((yield = (res >= 0)))
{
+ PCRE2_SIZE * ovec = pcre2_get_ovector_pointer(md);
res = pcre2_get_ovector_count(md);
expand_nmax = setup < 0 ? 0 : setup + 1;
for (int matchnum = setup < 0 ? 0 : 1; matchnum < res; matchnum++)
{
- PCRE2_SIZE len;
- pcre2_substring_get_bynumber(md, matchnum,
- (PCRE2_UCHAR **)&expand_nstring[expand_nmax], &len);
- expand_nlength[expand_nmax++] = (int)len;
+ /* Although PCRE2 has a pcre2_substring_get_bynumber() conveneience, it
+ seems to return a bad pointer when a capture group had no data, eg. (.*)
+ matching zero letters. So use the underlying ovec and hope (!) that the
+ offsets are sane (including that case). Should we go further and range-
+ check each one vs. the subject string length? */
+ int off = matchnum * 2;
+ int len = ovec[off + 1] - ovec[off];
+ expand_nstring[expand_nmax] = string_copyn(subject + ovec[off], len);
+ expand_nlength[expand_nmax++] = len;
}
expand_nmax--;
}
*/
void
-set_process_info(const char *format, ...)
+set_process_info(const char * format, ...)
{
gstring gs = { .size = PROCESS_INFO_SIZE - 2, .ptr = 0, .s = process_info };
gstring * g;
int len;
+uschar * s;
va_list ap;
g = string_fmt_append(&gs, "%5d ", (int)getpid());
-len = g->ptr;
+len = gstring_length(g);
va_start(ap, format);
if (!string_vformat(g, 0, format, ap))
{
g = string_cat(&gs, US"**** string overflowed buffer ****");
}
g = string_catn(g, US"\n", 1);
-string_from_gstring(g);
-process_info_len = g->ptr;
+process_info_len = len_string_from_gstring(g, &s);
DEBUG(D_process_info) debug_printf("set_process_info: %s", process_info);
va_end(ap);
}
char ** ss;
int nptrs = backtrace(buf, STACKDUMP_MAX);
-log_write(0, LOG_MAIN|LOG_PANIC, "backtrace\n");
-log_write(0, LOG_MAIN|LOG_PANIC, "---\n");
+log_write(0, LOG_MAIN|LOG_PANIC, "backtrace");
+log_write(0, LOG_MAIN|LOG_PANIC, "---");
if ((ss = backtrace_symbols(buf, nptrs)))
{
for (int i = 0; i < nptrs; i++)
- log_write(0, LOG_MAIN|LOG_PANIC, "\t%s\n", ss[i]);
+ log_write(0, LOG_MAIN|LOG_PANIC, "\t%s", ss[i]);
free(ss);
}
else
- log_write(0, LOG_MAIN|LOG_PANIC, "backtrace_symbols: %s\n", strerror(errno));
-log_write(0, LOG_MAIN|LOG_PANIC, "---\n");
+ log_write(0, LOG_MAIN|LOG_PANIC, "backtrace_symbols: %s", strerror(errno));
+log_write(0, LOG_MAIN|LOG_PANIC, "---");
#endif
}
#undef STACKDUMP_MAX
va_list ap;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
+va_end(ap);
exit(EXIT_FAILURE);
}
DEBUG(D_any) {} else g = show_db_version(g);
g = string_cat(g, US"Support for:");
+#ifdef WITH_CONTENT_SCAN
+ g = string_cat(g, US" Content_Scanning");
+#endif
#ifdef SUPPORT_CRYPTEQ
g = string_cat(g, US" crypteq");
#endif
+#ifdef EXPAND_DLFUNC
+ g = string_cat(g, US" Expand_dlfunc");
+#endif
#if HAVE_ICONV
g = string_cat(g, US" iconv()");
#endif
#if HAVE_IPV6
g = string_cat(g, US" IPv6");
#endif
-#ifdef HAVE_SETCLASSRESOURCES
- g = string_cat(g, US" use_setclassresources");
-#endif
#ifdef SUPPORT_PAM
g = string_cat(g, US" PAM");
#endif
#ifdef EXIM_PERL
g = string_cat(g, US" Perl");
#endif
-#ifdef EXPAND_DLFUNC
- g = string_cat(g, US" Expand_dlfunc");
-#endif
-#ifdef USE_TCP_WRAPPERS
- g = string_cat(g, US" TCPwrappers");
-#endif
#ifdef USE_GNUTLS
g = string_cat(g, US" GnuTLS");
#endif
+#ifdef SUPPORT_MOVE_FROZEN_MESSAGES
+ g = string_cat(g, US" move_frozen_messages");
+#endif
#ifdef USE_OPENSSL
g = string_cat(g, US" OpenSSL");
#endif
+#if defined(CYRUS_PWCHECK_SOCKET)
+ g = string_cat(g, US" pwcheck");
+#endif
+#if defined(RADIUS_CONFIG_FILE)
+ g = string_cat(g, US" radius");
+#endif
#ifndef DISABLE_TLS_RESUME
g = string_cat(g, US" TLS_resume");
#endif
#ifdef SUPPORT_TRANSLATE_IP_ADDRESS
g = string_cat(g, US" translate_ip_address");
#endif
-#ifdef SUPPORT_MOVE_FROZEN_MESSAGES
- g = string_cat(g, US" move_frozen_messages");
+#ifdef USE_TCP_WRAPPERS
+ g = string_cat(g, US" TCPwrappers");
#endif
-#ifdef WITH_CONTENT_SCAN
- g = string_cat(g, US" Content_Scanning");
+#ifdef HAVE_SETCLASSRESOURCES
+ g = string_cat(g, US" use_setclassresources");
#endif
#ifdef SUPPORT_DANE
g = string_cat(g, US" DANE");
#ifdef EXPERIMENTAL_QUEUEFILE
g = string_cat(g, US" Experimental_QUEUEFILE");
#endif
+#ifdef EXPERIMENTAL_XCLIENT
+ g = string_cat(g, US" Experimental_XCLIENT");
+#endif
g = string_cat(g, US"\n");
g = string_cat(g, US"Lookups (built-in):");
#if defined(__clang__)
g = string_fmt_append(g, "Compiler: CLang [%s]\n", __clang_version__);
#elif defined(__GNUC__)
- g = string_fmt_append(g, "Compiler: GCC [%s]\n",
# ifdef __VERSION__
- __VERSION__
+ g = string_fmt_append(g, "Compiler: GCC [%s]\n", __VERSION__);
# else
- "? unknown version ?"
+ g = string_fmt_append(g, "Compiler: GCC [%s]\n", "? unknown version ?";
# endif
- );
#else
g = string_cat(g, US"Compiler: <unknown>\n");
#endif
#endif
/* g can only be NULL if ss==p */
- if (ss == p || g->s[g->ptr-1] != '\\') /* not continuation; done */
+ if (ss == p || gstring_last_char(g) != '\\') /* not continuation; done */
break;
- --g->ptr; /* drop the \ */
+ gstring_trim(g, 1); /* drop the \ */
}
if (had_input) return g ? string_from_gstring(g) : US"";
*/
static void
-exim_usage(uschar *progname)
+exim_usage(const uschar * progname)
{
/* Handle specific program invocation variants */
+/*************************************************
+* Queue-runner operations *
+*************************************************/
+
+/* Prefix a new qrunner descriptor to the qrunners list */
+
+static qrunner *
+alloc_qrunner(void)
+{
+qrunner * q = qrunners;
+qrunners = store_get(sizeof(qrunner), GET_UNTAINTED);
+memset(qrunners, 0, sizeof(qrunner)); /* default queue, zero interval */
+qrunners->next = q;
+qrunners->next_tick = time(NULL); /* run right away */
+return qrunners;
+}
+
+static qrunner *
+alloc_onetime_qrunner(void)
+{
+qrunners = store_get_perm(sizeof(qrunner), GET_UNTAINTED);
+memset(qrunners, 0, sizeof(qrunner)); /* default queue, zero interval */
+qrunners->next_tick = time(NULL); /* run right away */
+qrunners->run_max = 1;
+return qrunners;
+}
+
+
/*************************************************
* Entry point and high-level code *
*************************************************/
*/
int
-main(int argc, char **cargv)
+main(int argc, char ** cargv)
{
-uschar **argv = USS cargv;
+const uschar ** argv = CUSS cargv;
int arg_receive_timeout = -1;
int arg_smtp_receive_timeout = -1;
int arg_error_handling = error_handling;
int filter_ufd = -1;
int group_count;
int i, rv;
-int list_queue_option = 0;
+int list_queue_option = QL_BASIC;
int msg_action = 0;
int msg_action_arg = -1;
int namelen = argv[0] ? Ustrlen(argv[0]) : 0;
BOOL verify_as_sender = FALSE;
BOOL rcpt_verify_quota = FALSE;
BOOL version_printed = FALSE;
-uschar *alias_arg = NULL;
-uschar *called_as = US"";
-uschar *cmdline_syslog_name = NULL;
-uschar *start_queue_run_id = NULL;
-uschar *stop_queue_run_id = NULL;
-uschar *expansion_test_message = NULL;
+const uschar *alias_arg = NULL;
+const uschar *called_as = US"";
+const uschar *cmdline_syslog_name = NULL;
+const uschar *start_queue_run_id = NULL;
+const uschar *stop_queue_run_id = NULL;
+const uschar *expansion_test_message = NULL;
const uschar *ftest_domain = NULL;
const uschar *ftest_localpart = NULL;
const uschar *ftest_prefix = NULL;
const uschar *ftest_suffix = NULL;
uschar *log_oneline = NULL;
-uschar *malware_test_file = NULL;
+const uschar *malware_test_file = NULL;
uschar *real_sender_address;
uschar *originator_home = US"/";
size_t sz;
/* If running in a dockerized environment, the TERM signal is only
delegated to the PID 1 if we request it by setting an signal handler */
+
if (getpid() == 1) signal(SIGTERM, term_handler);
/* SIGHUP is used to get the daemon to reconfigure. It gets set as appropriate
using mac_ismsgid, which uses this. */
regex_ismsgid =
- regex_must_compile(US"^(?:[^\\W_]{6}-){2}[^\\W_]{2}$", MCS_NOFLAGS, TRUE);
+ regex_must_compile(US"^(?:"
+ "[^\\W_]{" str(MESSAGE_ID_TIME_LEN) "}"
+ "-[^\\W_]{" str(MESSAGE_ID_PID_LEN) "}"
+ "-[^\\W_]{" str(MESSAGE_ID_SUBTIME_LEN) "}"
+ "|"
+ "(?:[^\\W_]{6}-){2}[^\\W_]{2}" /* old ID format */
+ ")$",
+ MCS_NOFLAGS, TRUE);
/* Precompile the regular expression that is used for matching an SMTP error
code, possibly extended, at the start of an error message. Note that the
regex_must_compile(US"^[A-Za-z0-9_/.-]*$", MCS_NOFLAGS, TRUE);
#endif
-for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
-
/* If the program is called as "mailq" treat it as equivalent to "exim -bp";
this seems to be a generally accepted convention, since one finds symbolic
links called "mailq" in standard OS configurations. */
if ((namelen == 4 && Ustrcmp(argv[0], "runq") == 0) ||
(namelen > 4 && Ustrncmp(argv[0] + namelen - 5, "/runq", 5) == 0))
{
- queue_interval = 0;
+ alloc_onetime_qrunner();
receiving_message = FALSE;
called_as = US"-runq";
}
for (i = 1; i < argc; i++)
{
BOOL badarg = FALSE;
- uschar * arg = argv[i];
- uschar * argrest;
- int switchchar;
+ const uschar * arg = argv[i];
+ const uschar * argrest;
+ uschar switchchar;
/* An argument not starting with '-' is the start of a recipients list;
break out of the options-scanning loop. */
case 'I':
if (Ustrlen(argrest) >= 1 && *argrest == ':')
{
- uschar *p = argrest+1;
+ const uschar * p = argrest+1;
info_flag = CMDINFO_HELP;
if (Ustrlen(p))
if (strcmpic(p, CUS"sieve") == 0)
}
if (*argrest == 'r')
- {
- list_queue_option = 8;
- argrest++;
- }
- else list_queue_option = 0;
+ list_queue_option = QL_UNSORTED, argrest++;
+ else
+ list_queue_option = QL_BASIC;
list_queue = TRUE;
/* -bpu: List the contents of the mail queue, top-level undelivered */
- else if (Ustrcmp(argrest, "u") == 0) list_queue_option += 1;
+ else if (Ustrcmp(argrest, "u") == 0) list_queue_option |= QL_UNDELIVERED_ONLY;
/* -bpa: List the contents of the mail queue, including all delivered */
- else if (Ustrcmp(argrest, "a") == 0) list_queue_option += 2;
+ else if (Ustrcmp(argrest, "a") == 0) list_queue_option |= QL_PLUS_GENERATED;
+
+ /* -bpi: List only message IDs */
+
+ else if (Ustrcmp(argrest, "i") == 0) list_queue_option |= QL_MSGID_ONLY;
/* Unknown after -bp[r] */
#else
{
int ptr = 0;
- macro_item *m;
+ macro_item * m;
uschar name[24];
- uschar *s = argrest;
+ const uschar * s = argrest;
opt_D_used = TRUE;
while (isspace(*s)) s++;
*(sender_address = store_get(1, GET_UNTAINTED)) = '\0'; /* Ensure writeable memory */
else
{
- uschar * temp = argrest + Ustrlen(argrest) - 1;
+ const uschar * temp = argrest + Ustrlen(argrest) - 1;
while (temp >= argrest && isspace(*temp)) temp--;
if (temp >= argrest && *temp == '.') f_end_dot = TRUE;
allow_domain_literals = TRUE;
/* -oB: Set a connection message max value for remote deliveries */
case 'B':
{
- uschar * p = argrest;
+ const uschar * p = argrest;
if (!*p)
if (i+1 < argc && isdigit((argv[i+1][0])))
p = argv[++i];
else if (Ustrcmp(argrest, "ai") == 0)
authenticated_id = string_copy_taint(
- exim_str_fail_toolong(argv[++i], EXIM_EMAILADDR_MAX, "-oMas"),
+ exim_str_fail_toolong(argv[++i], EXIM_EMAILADDR_MAX, "-oMai"),
GET_TAINTED);
/* -oMi: Set incoming interface address */
case 'Y':
if (*argrest) badarg = TRUE;
- else notifier_socket = NULL;
+ else f.notifier_socket_en = FALSE;
break;
/* Unknown -o argument */
}
break;
+ /* -q: set up queue runs */
case 'q':
- receiving_message = FALSE;
- if (queue_interval >= 0)
- exim_fail("exim: -q specified more than once\n");
-
- /* -qq...: Do queue runs in a 2-stage manner */
-
- if (*argrest == 'q')
{
- f.queue_2stage = TRUE;
- argrest++;
- }
+ BOOL two_stage, first_del, force, thaw = FALSE, local;
- /* -qi...: Do only first (initial) deliveries */
+ receiving_message = FALSE;
- if (*argrest == 'i')
- {
- f.queue_run_first_delivery = TRUE;
- argrest++;
- }
+ /* -qq...: Do queue runs in a 2-stage manner */
- /* -qf...: Run the queue, forcing deliveries
- -qff..: Ditto, forcing thawing as well */
+ if ((two_stage = *argrest == 'q'))
+ argrest++;
- if (*argrest == 'f')
- {
- f.queue_run_force = TRUE;
- if (*++argrest == 'f')
- {
- f.deliver_force_thaw = TRUE;
- argrest++;
- }
- }
+ /* -qi...: Do only first (initial) deliveries */
- /* -q[f][f]l...: Run the queue only on local deliveries */
+ if ((first_del = *argrest == 'i'))
+ argrest++;
- if (*argrest == 'l')
- {
- f.queue_run_local = TRUE;
- argrest++;
- }
+ /* -qf...: Run the queue, forcing deliveries
+ -qff..: Ditto, forcing thawing as well */
- /* -q[f][f][l][G<name>]... Work on the named queue */
+ if ((force = *argrest == 'f'))
+ if ((thaw = *++argrest == 'f'))
+ argrest++;
- if (*argrest == 'G')
- {
- int i;
- for (argrest++, i = 0; argrest[i] && argrest[i] != '/'; ) i++;
- exim_len_fail_toolong(i, EXIM_DRIVERNAME_MAX, "-q*G<name>");
- queue_name = string_copyn(argrest, i);
- argrest += i;
- if (*argrest == '/') argrest++;
- }
+ /* -q[f][f]l...: Run the queue only on local deliveries */
+
+ if ((local = *argrest == 'l'))
+ argrest++;
- /* -q[f][f][l][G<name>]: Run the queue, optionally forced, optionally local
- only, optionally named, optionally starting from a given message id. */
+ /* -q[f][f][l][G<name>]... Work on the named queue */
- if (!(list_queue || count_queue))
- if ( !*argrest
- && (i + 1 >= argc || argv[i+1][0] == '-' || mac_ismsgid(argv[i+1])))
+ if (*argrest == 'G')
{
- queue_interval = 0;
- if (i+1 < argc && mac_ismsgid(argv[i+1]))
- start_queue_run_id = string_copy_taint(argv[++i], GET_TAINTED);
- if (i+1 < argc && mac_ismsgid(argv[i+1]))
- stop_queue_run_id = string_copy_taint(argv[++i], GET_TAINTED);
+ int i;
+ for (argrest++, i = 0; argrest[i] && argrest[i] != '/'; ) i++;
+ exim_len_fail_toolong(i, EXIM_DRIVERNAME_MAX, "-q*G<name>");
+ queue_name = string_copyn(argrest, i);
+ argrest += i;
+ if (*argrest == '/') argrest++;
}
- /* -q[f][f][l][G<name>/]<n>: Run the queue at regular intervals, optionally
- forced, optionally local only, optionally named. */
+ /* -q[f][f][l][G<name>]: Run the queue, optionally forced, optionally local
+ only, optionally named, optionally starting from a given message id. */
- else if ((queue_interval = readconf_readtime(*argrest ? argrest : argv[++i],
- 0, FALSE)) <= 0)
- exim_fail("exim: bad time value %s: abandoned\n", argv[i]);
- break;
+ if (!(list_queue || count_queue))
+ {
+ qrunner * q;
+
+ if ( !*argrest
+ && (i + 1 >= argc || argv[i+1][0] == '-' || mac_ismsgid(argv[i+1])))
+ {
+ q = alloc_onetime_qrunner();
+ if (i+1 < argc && mac_ismsgid(argv[i+1]))
+ start_queue_run_id = string_copy_taint(argv[++i], GET_TAINTED);
+ if (i+1 < argc && mac_ismsgid(argv[i+1]))
+ stop_queue_run_id = string_copy_taint(argv[++i], GET_TAINTED);
+ }
+
+ /* -q[f][f][l][G<name>/]<n>: Run the queue at regular intervals, optionally
+ forced, optionally local only, optionally named. */
+
+ else
+ {
+ int intvl = readconf_readtime(*argrest ? argrest : argv[++i], 0, FALSE);
+ if (intvl <= 0)
+ exim_fail("exim: bad time value %s: abandoned\n", argv[i]);
+
+ for (qrunner * qq = qrunners; qq; qq = qq->next)
+ if ( queue_name && qq->name && Ustrcmp(queue_name, qq->name) == 0
+ || !queue_name && !qq->name)
+ exim_fail("exim: queue-runner specified more than once\n");
+
+ q = alloc_qrunner();
+ q->interval = intvl;
+ }
+
+ q->name = *queue_name ? queue_name : NULL; /* will be NULL for the default queue */
+ q->queue_run_force = force;
+ q->deliver_force_thaw = thaw;
+ q->queue_run_first_delivery = first_del;
+ q->queue_run_local = local;
+ q->queue_2stage = two_stage;
+ }
+
+ break;
+ }
case 'R': /* Synonymous with -qR... */
+ case 'S': /* Synonymous with -qS... */
{
- const uschar *tainted_selectstr;
+ const uschar * tainted_selectstr;
+ uschar * s;
receiving_message = FALSE;
-Rrf: Regex and force
-Rrff: Regex and force and thaw
+ -S...: Like -R but works on sender.
+
in all cases provided there are no further characters in this
argument. */
+ alloc_onetime_qrunner();
+ qrunners->queue_2stage = f.queue_2stage;
if (*argrest)
for (int i = 0; i < nelem(rsopts); i++)
if (Ustrcmp(argrest, rsopts[i]) == 0)
{
- if (i != 2) f.queue_run_force = TRUE;
- if (i >= 2) f.deliver_selectstring_regex = TRUE;
- if (i == 1 || i == 4) f.deliver_force_thaw = TRUE;
+ if (i != 2) qrunners->queue_run_force = TRUE;
+ if (i >= 2)
+ if (switchchar == 'R')
+ f.deliver_selectstring_regex = TRUE;
+ else
+ f.deliver_selectstring_sender_regex = TRUE;
+ if (i == 1 || i == 4) qrunners->deliver_force_thaw = TRUE;
argrest += Ustrlen(rsopts[i]);
}
- /* -R: Set string to match in addresses for forced queue run to
+ /* -R or -S: Set string to match in addresses for forced queue run to
pick out particular messages. */
/* Avoid attacks from people providing very long strings, and do so before
else if (i+1 < argc)
tainted_selectstr = argv[++i];
else
- exim_fail("exim: string expected after -R\n");
- deliver_selectstring = string_copy_taint(
+ exim_fail("exim: string expected after %s\n", switchchar == 'R' ? "-R" : "-S");
+
+ s = string_copy_taint(
exim_str_fail_toolong(tainted_selectstr, EXIM_EMAILADDR_MAX, "-R"),
GET_TAINTED);
- }
- break;
- /* -r: an obsolete synonym for -f (see above) */
-
-
- /* -S: Like -R but works on sender. */
-
- case 'S': /* Synonymous with -qS... */
- {
- const uschar *tainted_selectstr;
-
- receiving_message = FALSE;
-
- /* -Sf: As -S (below) but force all deliveries,
- -Sff: Ditto, but also thaw all frozen messages,
- -Sr: String is regex
- -Srf: Regex and force
- -Srff: Regex and force and thaw
-
- in all cases provided there are no further characters in this
- argument. */
-
- if (*argrest)
- for (int i = 0; i < nelem(rsopts); i++)
- if (Ustrcmp(argrest, rsopts[i]) == 0)
- {
- if (i != 2) f.queue_run_force = TRUE;
- if (i >= 2) f.deliver_selectstring_sender_regex = TRUE;
- if (i == 1 || i == 4) f.deliver_force_thaw = TRUE;
- argrest += Ustrlen(rsopts[i]);
- }
-
- /* -S: Set string to match in addresses for forced queue run to
- pick out particular messages. */
-
- if (*argrest)
- tainted_selectstr = argrest;
- else if (i+1 < argc)
- tainted_selectstr = argv[++i];
+ if (switchchar == 'R')
+ deliver_selectstring = s;
else
- exim_fail("exim: string expected after -S\n");
- deliver_selectstring_sender = string_copy_taint(
- exim_str_fail_toolong(tainted_selectstr, EXIM_EMAILADDR_MAX, "-S"),
- GET_TAINTED);
+ deliver_selectstring_sender = s;
}
break;
+
+ /* -r: an obsolete synonym for -f (see above) */
+
/* -Tqt is an option that is exclusively for use by the testing suite.
It is not recognized in other circumstances. It allows for the setting up
of explicit "queue times" so that various warning/retry things can be
/* If -R or -S have been specified without -q, assume a single queue run. */
- if ( (deliver_selectstring || deliver_selectstring_sender)
- && queue_interval < 0)
- queue_interval = 0;
+ if ((deliver_selectstring || deliver_selectstring_sender) && !qrunners)
+ alloc_onetime_qrunner();
END_ARG:
/* Arguments have been processed. Check for incompatibilities. */
if ( ( (smtp_input || extract_recipients || recipients_arg < argc)
- && ( f.daemon_listen || queue_interval >= 0 || bi_option
+ && ( f.daemon_listen || qrunners || bi_option
|| test_retry_arg >= 0 || test_rewrite_arg >= 0
|| filter_test != FTEST_NONE
|| msg_action_arg > 0 && !one_msg_action
) )
|| ( msg_action_arg > 0
- && ( f.daemon_listen || queue_interval > 0 || list_options
+ && ( f.daemon_listen || is_multiple_qrun() || list_options
|| checking && msg_action != MSG_LOAD
|| bi_option || test_retry_arg >= 0 || test_rewrite_arg >= 0
) )
- || ( (f.daemon_listen || queue_interval > 0)
+ || ( (f.daemon_listen || is_multiple_qrun())
&& ( sender_address || list_options || list_queue || checking
|| bi_option
) )
- || f.daemon_listen && queue_interval == 0
- || f.inetd_wait_mode && queue_interval >= 0
+ || f.daemon_listen && is_onetime_qrun()
+ || f.inetd_wait_mode && qrunners
|| ( list_options
&& ( checking || smtp_input || extract_recipients
|| filter_test != FTEST_NONE || bi_option
|| ( smtp_input
&& (sender_address || filter_test != FTEST_NONE || extract_recipients)
)
- || deliver_selectstring && queue_interval < 0
+ || deliver_selectstring && !qrunners
|| msg_action == MSG_LOAD && (!expansion_test || expansion_test_message)
)
exim_fail("exim: incompatible command-line options or arguments\n");
if (bi_command && *bi_command)
{
int i = 0;
- uschar *argv[3];
+ const uschar * argv[3];
argv[i++] = bi_command; /* nonexpanded option so assume untainted */
if (alias_arg) argv[i++] = alias_arg;
argv[i++] = NULL;
if ( deliver_give_up || f.daemon_listen || malware_test_file
|| count_queue && queue_list_requires_admin
|| list_queue && queue_list_requires_admin
- || queue_interval >= 0 && prod_requires_admin
+ || qrunners && prod_requires_admin
|| queue_name_dest && prod_requires_admin
|| debugset && !f.running_in_test_harness
)
- exim_fail("exim:%s permission denied\n", debugset ? " debugging" : "");
+ exim_fail("exim:%s permission denied; not admin\n",
+ debugset ? " debugging" : "");
}
/* If the real user is not root or the exim uid, the argument for passing
if ( real_uid != root_uid && real_uid != exim_uid
&& ( continue_hostname
|| ( f.dont_deliver
- && (queue_interval >= 0 || f.daemon_listen || msg_action_arg > 0)
+ && (qrunners || f.daemon_listen || msg_action_arg > 0)
) )
&& !f.running_in_test_harness
)
- exim_fail("exim: Permission denied\n");
+ exim_fail("exim: Permission denied; not exim user or root\n");
/* If the caller is not trusted, certain arguments are ignored when running for
real, but are permitted when checking things (-be, -bv, -bt, -bh, -bf, -bF).
if ( !unprivileged /* originally had root AND */
&& !removed_privilege /* still got root AND */
&& !f.daemon_listen /* not starting the daemon */
- && queue_interval <= 0 /* (either kind of daemon) */
+ && (!qrunners || is_onetime_qrun()) /* (either kind of daemon) */
&& ( /* AND EITHER */
deliver_drop_privilege /* requested unprivileged */
|| ( /* OR */
- queue_interval < 0 /* not running the queue */
+ !qrunners /* not running the queue */
&& ( msg_action_arg < 0 /* and */
|| msg_action != MSG_DELIVER /* not delivering */
) /* and */
}
/* We used to set up here to skip reading the ACL section, on
- (msg_action_arg > 0 || (queue_interval == 0 && !f.daemon_listen)
+ (msg_action_arg > 0 || (is_onetime_qrun() && !f.daemon_listen)
Now, since the intro of the ${acl } expansion, ACL definitions may be
needed in transports so we lost the optimisation. */
exim_fail("exim: missing recipient for quota check\n");
else
{
- verify_quota(argv[recipients_arg]);
+ verify_quota(US argv[recipients_arg]); /*XXX we lose track of const here */
exim_exit(EXIT_SUCCESS);
}
/* If only a single queue run is requested, without SMTP listening, we can just
turn into a queue runner, with an optional starting message id. */
-if (queue_interval == 0 && !f.daemon_listen)
+if (is_onetime_qrun() && !f.daemon_listen)
{
- DEBUG(D_queue_run) debug_printf("Single queue run%s%s%s%s\n",
- start_queue_run_id ? US" starting at " : US"",
- start_queue_run_id ? start_queue_run_id: US"",
- stop_queue_run_id ? US" stopping at " : US"",
- stop_queue_run_id ? stop_queue_run_id : US"");
- if (*queue_name)
- set_process_info("running the '%s' queue (single queue run)", queue_name);
- else
- set_process_info("running the queue (single queue run)");
- queue_run(start_queue_run_id, stop_queue_run_id, FALSE);
+ single_queue_run(qrunners, start_queue_run_id, stop_queue_run_id);
exim_exit(EXIT_SUCCESS);
}
for incoming messages via the daemon. The daemon cannot be run in mua_wrapper
mode. */
-if (f.daemon_listen || f.inetd_wait_mode || queue_interval > 0)
+if (f.daemon_listen || f.inetd_wait_mode || is_multiple_qrun())
{
if (mua_wrapper)
{
"**** This is not for real!\n\n",
sender_host_address);
+ connection_id = getpid();
memset(sender_host_cache, 0, sizeof(sender_host_cache));
if (verify_check_host(&hosts_connection_nolog) == OK)
{
(usually "connection refused: <reason>") and writing another one is
unnecessary clutter. */
+connection_id = getpid();
if (smtp_input)
{
smtp_in = stdin;
{
int rcount = 0;
int count = argc - recipients_arg;
- uschar **list = argv + recipients_arg;
+ const uschar ** list = argv + recipients_arg;
/* These options cannot be changed dynamically for non-SMTP messages */
int start, end, domain;
uschar * errmess;
/* There can be multiple addresses, so EXIM_DISPLAYMAIL_MAX (tuned for 1) is too short.
- * We'll still want to cap it to something, just in case. */
+ We'll still want to cap it to something, just in case. */
uschar * s = string_copy_taint(
exim_str_fail_toolong(list[i], BIG_BUFFER_SIZE, "address argument"),
GET_TAINTED);
dnslist_domain = dnslist_matched = NULL;
#ifdef WITH_CONTENT_SCAN
malware_name = NULL;
+ regex_vars_clear();
#endif
callout_address = NULL;
sending_ip_address = NULL;
deliver_localpart_data = deliver_domain_data =
recipient_data = sender_data = NULL;
acl_var_m = NULL;
- for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
+ lookup_value = NULL; /* Can be set by ACL */
store_reset(reset_point);
}
git://git.exim.org / exim.git / blobdiff