X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/76ac1b5bce3ce3e3cc4c49c5c42b568f2a65ceee..acec9514b1006e352ef283f205ecec75a9b6ff0d:/src/src/readconf.c diff --git a/src/src/readconf.c b/src/src/readconf.c index a23a57ce8..1cbbd83ef 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -11,133 +11,12 @@ implementation of the conditional .ifdef etc. */ #include "exim.h" -extern char **environ; - -static void fn_smtp_receive_timeout(const uschar * name, const uschar * str); -static void save_config_line(const uschar* line); -static void save_config_position(const uschar *file, int line); -static void print_config(BOOL admin, BOOL terse); -static void readconf_options_auths(void); - - -#define CSTATE_STACK_SIZE 10 - - -/* Structure for chain (stack) of .included files */ - -typedef struct config_file_item { - struct config_file_item *next; - uschar *filename; - FILE *file; - int lineno; -} config_file_item; - -/* Structure for chain of configuration lines (-bP config) */ - -typedef struct config_line_item { - struct config_line_item *next; - uschar *line; -} config_line_item; - -static config_line_item* config_lines; - -/* Structure of table of conditional words and their state transitions */ - -typedef struct cond_item { - uschar *name; - int namelen; - int action1; - int action2; - int pushpop; -} cond_item; - -/* Structure of table of syslog facility names and values */ - -typedef struct syslog_fac_item { - uschar *name; - int value; -} syslog_fac_item; - -/* constants */ -static const char * const hidden = ""; - -/* Static variables */ - -static config_file_item *config_file_stack = NULL; /* For includes */ - -static uschar *syslog_facility_str = NULL; -static uschar next_section[24]; -static uschar time_buffer[24]; - -/* State variables for conditional loading (.ifdef / .else / .endif) */ - -static int cstate = 0; -static int cstate_stack_ptr = -1; -static int cstate_stack[CSTATE_STACK_SIZE]; - -/* Table of state transitions for handling conditional inclusions. There are -four possible state transitions: - - .ifdef true - .ifdef false - .elifdef true (or .else) - .elifdef false - -.endif just causes the previous cstate to be popped off the stack */ - -static int next_cstate[3][4] = - { - /* State 0: reading from file, or reading until next .else or .endif */ - { 0, 1, 2, 2 }, - /* State 1: condition failed, skipping until next .else or .endif */ - { 2, 2, 0, 1 }, - /* State 2: skipping until .endif */ - { 2, 2, 2, 2 }, - }; - -/* Table of conditionals and the states to set. For each name, there are four -values: the length of the name (to save computing it each time), the state to -set if a macro was found in the line, the state to set if a macro was not found -in the line, and a stack manipulation setting which is: - - -1 pull state value off the stack - 0 don't alter the stack - +1 push value onto stack, before setting new state -*/ - -static cond_item cond_list[] = { - { US"ifdef", 5, 0, 1, 1 }, - { US"ifndef", 6, 1, 0, 1 }, - { US"elifdef", 7, 2, 3, 0 }, - { US"elifndef", 8, 3, 2, 0 }, - { US"else", 4, 2, 2, 0 }, - { US"endif", 5, 0, 0, -1 } -}; - -static int cond_list_size = sizeof(cond_list)/sizeof(cond_item); - -/* Table of syslog facility names and their values */ - -static syslog_fac_item syslog_list[] = { - { US"mail", LOG_MAIL }, - { US"user", LOG_USER }, - { US"news", LOG_NEWS }, - { US"uucp", LOG_UUCP }, - { US"local0", LOG_LOCAL0 }, - { US"local1", LOG_LOCAL1 }, - { US"local2", LOG_LOCAL2 }, - { US"local3", LOG_LOCAL3 }, - { US"local4", LOG_LOCAL4 }, - { US"local5", LOG_LOCAL5 }, - { US"local6", LOG_LOCAL6 }, - { US"local7", LOG_LOCAL7 }, - { US"daemon", LOG_DAEMON } -}; - -static int syslog_list_size = sizeof(syslog_list)/sizeof(syslog_fac_item); - - +#ifdef MACRO_PREDEF +# include "macro_predef.h" +#endif +static uschar * syslog_facility_str; +static void fn_smtp_receive_timeout(const uschar *, const uschar *); /************************************************* * Main configuration options * @@ -214,6 +93,7 @@ static optionlist optionlist_config[] = { { "check_spool_inodes", opt_int, &check_spool_inodes }, { "check_spool_space", opt_Kint, &check_spool_space }, { "chunking_advertise_hosts", opt_stringptr, &chunking_advertise_hosts }, + { "commandline_checks_require_admin", opt_bool,&commandline_checks_require_admin }, { "daemon_smtp_port", opt_stringptr|opt_hidden, &daemon_smtp_port }, { "daemon_smtp_ports", opt_stringptr, &daemon_smtp_port }, { "daemon_startup_retries", opt_int, &daemon_startup_retries }, @@ -223,6 +103,7 @@ static optionlist optionlist_config[] = { { "dccifd_address", opt_stringptr, &dccifd_address }, { "dccifd_options", opt_stringptr, &dccifd_options }, #endif + { "debug_store", opt_bool, &debug_store }, { "delay_warning", opt_timelist, &delay_warning }, { "delay_warning_condition", opt_stringptr, &delay_warning_condition }, { "deliver_drop_privilege", opt_bool, &deliver_drop_privilege }, @@ -250,7 +131,7 @@ static optionlist optionlist_config[] = { { "dns_retry", opt_int, &dns_retry }, { "dns_trust_aa", opt_stringptr, &dns_trust_aa }, { "dns_use_edns0", opt_int, &dns_use_edns0 }, - /* This option is now a no-op, retained for compability */ + /* This option is now a no-op, retained for compatibility */ { "drop_cr", opt_bool, &drop_cr }, /*********************************************************/ { "dsn_advertise_hosts", opt_stringptr, &dsn_advertise_hosts }, @@ -428,6 +309,7 @@ static optionlist optionlist_config[] = { #endif { "split_spool_directory", opt_bool, &split_spool_directory }, { "spool_directory", opt_stringptr, &spool_directory }, + { "spool_wireformat", opt_bool, &spool_wireformat }, #ifdef LOOKUP_SQLITE { "sqlite_lock_timeout", opt_int, &sqlite_lock_timeout }, #endif @@ -445,6 +327,7 @@ static optionlist optionlist_config[] = { { "strip_trailing_dot", opt_bool, &strip_trailing_dot }, { "syslog_duplication", opt_bool, &syslog_duplication }, { "syslog_facility", opt_stringptr, &syslog_facility_str }, + { "syslog_pid", opt_bool, &syslog_pid }, { "syslog_processname", opt_stringptr, &syslog_processname }, { "syslog_timestamp", opt_bool, &syslog_timestamp }, { "system_filter", opt_stringptr, &system_filter }, @@ -489,7 +372,166 @@ static optionlist optionlist_config[] = { { "write_rejectlog", opt_bool, &write_rejectlog } }; +#ifndef MACRO_PREDEF static int optionlist_config_size = nelem(optionlist_config); +#endif + + +#ifdef MACRO_PREDEF + +static void fn_smtp_receive_timeout(const uschar * name, const uschar * str) {/*Dummy*/} + +void +options_main(void) +{ +options_from_list(optionlist_config, nelem(optionlist_config), US"MAIN", NULL); +} + +void +options_auths(void) +{ +struct auth_info * ai; +uschar buf[64]; + +options_from_list(optionlist_auths, optionlist_auths_size, US"AUTHENTICATORS", NULL); + +for (ai = auths_available; ai->driver_name[0]; ai++) + { + spf(buf, sizeof(buf), US"_DRIVER_AUTHENTICATOR_%T", ai->driver_name); + builtin_macro_create(buf); + options_from_list(ai->options, (unsigned)*ai->options_count, US"AUTHENTICATOR", ai->driver_name); + } +} + + +#else /*!MACRO_PREDEF*/ + +extern char **environ; + +static void save_config_line(const uschar* line); +static void save_config_position(const uschar *file, int line); +static void print_config(BOOL admin, BOOL terse); + + +#define CSTATE_STACK_SIZE 10 + +const uschar *config_directory = NULL; + + +/* Structure for chain (stack) of .included files */ + +typedef struct config_file_item { + struct config_file_item *next; + const uschar *filename; + const uschar *directory; + FILE *file; + int lineno; +} config_file_item; + +/* Structure for chain of configuration lines (-bP config) */ + +typedef struct config_line_item { + struct config_line_item *next; + uschar *line; +} config_line_item; + +static config_line_item* config_lines; + +/* Structure of table of conditional words and their state transitions */ + +typedef struct cond_item { + uschar *name; + int namelen; + int action1; + int action2; + int pushpop; +} cond_item; + +/* Structure of table of syslog facility names and values */ + +typedef struct syslog_fac_item { + uschar *name; + int value; +} syslog_fac_item; + +/* constants */ +static const char * const hidden = ""; + +/* Static variables */ + +static config_file_item *config_file_stack = NULL; /* For includes */ + +static uschar *syslog_facility_str = NULL; +static uschar next_section[24]; +static uschar time_buffer[24]; + +/* State variables for conditional loading (.ifdef / .else / .endif) */ + +static int cstate = 0; +static int cstate_stack_ptr = -1; +static int cstate_stack[CSTATE_STACK_SIZE]; + +/* Table of state transitions for handling conditional inclusions. There are +four possible state transitions: + + .ifdef true + .ifdef false + .elifdef true (or .else) + .elifdef false + +.endif just causes the previous cstate to be popped off the stack */ + +static int next_cstate[3][4] = + { + /* State 0: reading from file, or reading until next .else or .endif */ + { 0, 1, 2, 2 }, + /* State 1: condition failed, skipping until next .else or .endif */ + { 2, 2, 0, 1 }, + /* State 2: skipping until .endif */ + { 2, 2, 2, 2 }, + }; + +/* Table of conditionals and the states to set. For each name, there are four +values: the length of the name (to save computing it each time), the state to +set if a macro was found in the line, the state to set if a macro was not found +in the line, and a stack manipulation setting which is: + + -1 pull state value off the stack + 0 don't alter the stack + +1 push value onto stack, before setting new state +*/ + +static cond_item cond_list[] = { + { US"ifdef", 5, 0, 1, 1 }, + { US"ifndef", 6, 1, 0, 1 }, + { US"elifdef", 7, 2, 3, 0 }, + { US"elifndef", 8, 3, 2, 0 }, + { US"else", 4, 2, 2, 0 }, + { US"endif", 5, 0, 0, -1 } +}; + +static int cond_list_size = sizeof(cond_list)/sizeof(cond_item); + +/* Table of syslog facility names and their values */ + +static syslog_fac_item syslog_list[] = { + { US"mail", LOG_MAIL }, + { US"user", LOG_USER }, + { US"news", LOG_NEWS }, + { US"uucp", LOG_UUCP }, + { US"local0", LOG_LOCAL0 }, + { US"local1", LOG_LOCAL1 }, + { US"local2", LOG_LOCAL2 }, + { US"local3", LOG_LOCAL3 }, + { US"local4", LOG_LOCAL4 }, + { US"local5", LOG_LOCAL5 }, + { US"local6", LOG_LOCAL6 }, + { US"local7", LOG_LOCAL7 }, + { US"daemon", LOG_DAEMON } +}; + +static int syslog_list_size = sizeof(syslog_list)/sizeof(syslog_fac_item); + @@ -523,7 +565,7 @@ for (r = routers; r; r = r->next) for (i = 0; i < *ri->options_count; i++) { if ((ri->options[i].type & opt_mask) != opt_stringptr) continue; - if (p == (char *)(r->options_block) + (long int)(ri->options[i].value)) + if (p == CS (r->options_block) + (long int)(ri->options[i].value)) return US ri->options[i].name; } } @@ -536,8 +578,8 @@ for (t = transports; t; t = t->next) optionlist * op = &ti->options[i]; if ((op->type & opt_mask) != opt_stringptr) continue; if (p == ( op->type & opt_public - ? (char *)t - : (char *)t->options_block + ? CS t + : CS t->options_block ) + (long int)op->value) return US op->name; @@ -554,40 +596,27 @@ return US""; * Deal with an assignment to a macro * *************************************************/ -/* We have a new definition. The macro_item structure includes a final vector -called "name" which is one byte long. Thus, adding "namelen" gives us enough -room to store the "name" string. -If a builtin macro we place at head of list, else tail. This lets us lazy-create -builtins. */ +/* We have a new definition; append to the list. + +Args: + name Name of the macro. Must be in storage persistent past the call + val Expansion result for the macro. Ditto persistence. +*/ macro_item * -macro_create(const uschar * name, const uschar * val, - BOOL command_line, BOOL builtin) +macro_create(const uschar * name, const uschar * val, BOOL command_line) { -unsigned namelen = Ustrlen(name); -macro_item * m = store_get(sizeof(macro_item) + namelen); +macro_item * m = store_get(sizeof(macro_item)); -if (!macros) - { - macros = m; - mlast = m; - m->next = NULL; - } -else if (builtin) - { - m->next = macros; - macros = m; - } -else - { - mlast->next = m; - mlast = m; - m->next = NULL; - } +/* fprintf(stderr, "%s: '%s' '%s'\n", __FUNCTION__, name, val); */ +m->next = NULL; m->command_line = command_line; -m->namelen = namelen; -m->replacement = string_copy(val); -Ustrcpy(m->name, name); +m->namelen = Ustrlen(name); +m->replen = Ustrlen(val); +m->name = name; +m->replacement = val; +mlast->next = m; +mlast = m; return m; } @@ -674,216 +703,21 @@ if (m && m->command_line) return; if (redef) if (m) + { + m->replen = Ustrlen(s); m->replacement = string_copy(s); + } else log_write(0, LOG_CONFIG|LOG_PANIC_DIE, "can't redefine an undefined macro " "\"%s\"", name); /* We have a new definition. */ else - (void) macro_create(name, s, FALSE, FALSE); -} - - - - - -/*************************************************/ -/* Create compile-time feature macros */ -static void -readconf_features(void) -{ -/* Probably we could work out a static initialiser for wherever -macros are stored, but this will do for now. Some names are awkward -due to conflicts with other common macros. */ - -#ifdef SUPPORT_CRYPTEQ - macro_create(US"_HAVE_CRYPTEQ", US"y", FALSE, TRUE); -#endif -#if HAVE_ICONV - macro_create(US"_HAVE_ICONV", US"y", FALSE, TRUE); -#endif -#if HAVE_IPV6 - macro_create(US"_HAVE_IPV6", US"y", FALSE, TRUE); -#endif -#ifdef HAVE_SETCLASSRESOURCES - macro_create(US"_HAVE_SETCLASSRESOURCES", US"y", FALSE, TRUE); -#endif -#ifdef SUPPORT_PAM - macro_create(US"_HAVE_PAM", US"y", FALSE, TRUE); -#endif -#ifdef EXIM_PERL - macro_create(US"_HAVE_PERL", US"y", FALSE, TRUE); -#endif -#ifdef EXPAND_DLFUNC - macro_create(US"_HAVE_DLFUNC", US"y", FALSE, TRUE); -#endif -#ifdef USE_TCP_WRAPPERS - macro_create(US"_HAVE_TCPWRAPPERS", US"y", FALSE, TRUE); -#endif -#ifdef SUPPORT_TLS - macro_create(US"_HAVE_TLS", US"y", FALSE, TRUE); -# ifdef USE_GNUTLS - macro_create(US"_HAVE_GNUTLS", US"y", FALSE, TRUE); -# else - macro_create(US"_HAVE_OPENSSL", US"y", FALSE, TRUE); -# endif -#endif -#ifdef SUPPORT_TRANSLATE_IP_ADDRESS - macro_create(US"_HAVE_TRANSLATE_IP_ADDRESS", US"y", FALSE, TRUE); -#endif -#ifdef SUPPORT_MOVE_FROZEN_MESSAGES - macro_create(US"_HAVE_MOVE_FROZEN_MESSAGES", US"y", FALSE, TRUE); -#endif -#ifdef WITH_CONTENT_SCAN - macro_create(US"_HAVE_CONTENT_SCANNING", US"y", FALSE, TRUE); -#endif -#ifndef DISABLE_DKIM - macro_create(US"_HAVE_DKIM", US"y", FALSE, TRUE); -#endif -#ifndef DISABLE_DNSSEC - macro_create(US"_HAVE_DNSSEC", US"y", FALSE, TRUE); -#endif -#ifndef DISABLE_EVENT - macro_create(US"_HAVE_EVENT", US"y", FALSE, TRUE); -#endif -#ifdef SUPPORT_I18N - macro_create(US"_HAVE_I18N", US"y", FALSE, TRUE); -#endif -#ifndef DISABLE_OCSP - macro_create(US"_HAVE_OCSP", US"y", FALSE, TRUE); -#endif -#ifndef DISABLE_PRDR - macro_create(US"_HAVE_PRDR", US"y", FALSE, TRUE); -#endif -#ifdef SUPPORT_PROXY - macro_create(US"_HAVE_PROXY", US"y", FALSE, TRUE); -#endif -#ifdef SUPPORT_SOCKS - macro_create(US"_HAVE_SOCKS", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_LMDB - macro_create(US"_HAVE_LMDB", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_SPF - macro_create(US"_HAVE_SPF", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_SRS - macro_create(US"_HAVE_SRS", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_BRIGHTMAIL - macro_create(US"_HAVE_BRIGHTMAIL", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_DANE - macro_create(US"_HAVE_DANE", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_DCC - macro_create(US"_HAVE_DCC", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_DMARC - macro_create(US"_HAVE_DMARC", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_DSN_INFO - macro_create(US"_HAVE_DSN_INFO", US"y", FALSE, TRUE); -#endif - -#ifdef LOOKUP_LSEARCH - macro_create(US"_HAVE_LKUP_LSEARCH", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_CDB - macro_create(US"_HAVE_LKUP_CDB", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_DBM - macro_create(US"_HAVE_LKUP_DBM", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_DNSDB - macro_create(US"_HAVE_LKUP_DNSDB", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_DSEARCH - macro_create(US"_HAVE_LKUP_DSEARCH", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_IBASE - macro_create(US"_HAVE_LKUP_IBASE", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_LDAP - macro_create(US"_HAVE_LKUP_LDAP", US"y", FALSE, TRUE); -#endif -#ifdef EXPERIMENTAL_LMDB - macro_create(US"_HAVE_LKUP_LMDB", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_MYSQL - macro_create(US"_HAVE_LKUP_MYSQL", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_NIS - macro_create(US"_HAVE_LKUP_NIS", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_NISPLUS - macro_create(US"_HAVE_LKUP_NISPLUS", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_ORACLE - macro_create(US"_HAVE_LKUP_ORACLE", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_PASSWD - macro_create(US"_HAVE_LKUP_PASSWD", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_PGSQL - macro_create(US"_HAVE_LKUP_PGSQL", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_REDIS - macro_create(US"_HAVE_LKUP_REDIS", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_SQLITE - macro_create(US"_HAVE_LKUP_SQLITE", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_TESTDB - macro_create(US"_HAVE_LKUP_TESTDB", US"y", FALSE, TRUE); -#endif -#ifdef LOOKUP_WHOSON - macro_create(US"_HAVE_LKUP_WHOSON", US"y", FALSE, TRUE); -#endif - -#ifdef TRANSPORT_APPENDFILE -# ifdef SUPPORT_MAILDIR - macro_create(US"_HAVE_TPT_APPEND_MAILDR", US"y", FALSE, TRUE); -# endif -# ifdef SUPPORT_MAILSTORE - macro_create(US"_HAVE_TPT_APPEND_MAILSTORE", US"y", FALSE, TRUE); -# endif -# ifdef SUPPORT_MBX - macro_create(US"_HAVE_TPT_APPEND_MBX", US"y", FALSE, TRUE); -# endif -#endif + (void) macro_create(string_copy(name), string_copy(s), FALSE); } -void -readconf_options_from_list(optionlist * opts, unsigned nopt, uschar * group) -{ -int i; -const uschar * s; -/* Walk the array backwards to get substring-conflict names */ -for (i = nopt-1; i >= 0; i--) if (*(s = opts[i].name) && *s != '*') - macro_create(string_sprintf("_OPT_%T_%T", group, s), US"y", FALSE, TRUE); -} - - -static void -readconf_options(void) -{ -readconf_options_from_list(optionlist_config, nelem(optionlist_config), US"MAIN"); -readconf_options_routers(); -readconf_options_transports(); -readconf_options_auths(); -} - -static void -macros_create_builtin(void) -{ -readconf_features(); -readconf_options(); -macros_builtin_created = TRUE; -} /************************************************* @@ -930,6 +764,7 @@ for (;;) (void)fclose(config_file); config_file = config_file_stack->file; config_filename = config_file_stack->filename; + config_directory = config_file_stack->directory; config_lineno = config_file_stack->lineno; config_file_stack = config_file_stack->next; if (config_lines) @@ -995,21 +830,10 @@ for (;;) if (*s != '=') s = ss; /* Not a macro definition */ } - /* If the builtin macros are not yet defined, and the line contains an - underscrore followed by an one of the three possible chars used by - builtins, create them. */ + /* Skip leading chars which cannot start a macro name, to avoid multiple + pointless rescans in Ustrstr calls. */ - if (!macros_builtin_created) - { - const uschar * t, * p; - uschar c; - for (t = s; (p = CUstrchr(t, '_')); t = p+1) - if (c = p[1], c == 'O' || c == 'D' || c == 'H') - { - macros_create_builtin(); - break; - } - } + while (*s && !isupper(*s) && *s != '_') s++; /* For each defined macro, scan the line (from after XXX= if present), replacing all occurrences of the macro. */ @@ -1017,17 +841,17 @@ for (;;) macro_found = FALSE; for (m = macros; m; m = m->next) { - uschar *p, *pp; - uschar *t = s; + uschar * p, *pp; + uschar * t = s; while ((p = Ustrstr(t, m->name)) != NULL) { int moveby; - int replen = Ustrlen(m->replacement); +/* fprintf(stderr, "%s: matched '%s' in '%s'\n", __FUNCTION__, m->name, ss); */ /* Expand the buffer if necessary */ - while (newlen - m->namelen + replen + 1 > big_buffer_size) + while (newlen - m->namelen + m->replen + 1 > big_buffer_size) { int newsize = big_buffer_size + BIG_BUFFER_SIZE; uschar *newbuffer = store_malloc(newsize); @@ -1046,13 +870,14 @@ for (;;) same macro. */ pp = p + m->namelen; - if ((moveby = replen - m->namelen) != 0) + if ((moveby = m->replen - m->namelen) != 0) { - memmove(p + replen, pp, (big_buffer + newlen) - pp + 1); + memmove(p + m->replen, pp, (big_buffer + newlen) - pp + 1); newlen += moveby; } - Ustrncpy(p, m->replacement, replen); - t = p + replen; + Ustrncpy(p, m->replacement, m->replen); + t = p + m->replen; + while (*t && !isupper(*t) && *t != '_') t++; macro_found = TRUE; } } @@ -1150,9 +975,17 @@ for (;;) } *t = 0; + /* We allow relative file names. For security reasons currently + relative names not allowed with .include_if_exists. For .include_if_exists + we need to check the permissions/ownership of the containing folder */ if (*ss != '/') - log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, ".include specifies a non-" - "absolute path \"%s\"", ss); + if (include_if_exists) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, ".include specifies a non-" + "absolute path \"%s\"", ss); + else + { + gstring * g = string_append(NULL, 3, config_directory, "/", ss); + ss = string_from_gstring(g); + } if (include_if_exists != 0 && (Ustat(ss, &statbuf) != 0)) continue; @@ -1163,6 +996,7 @@ for (;;) config_file_stack = save; save->file = config_file; save->filename = config_filename; + save->directory = config_directory; save->lineno = config_lineno; if (!(config_file = Ufopen(ss, "rb"))) @@ -1170,6 +1004,7 @@ for (;;) "configuration file %s", ss); config_filename = string_copy(ss); + config_directory = string_copyn(ss, CUstrrchr(ss, '/') - ss); config_lineno = 0; continue; } @@ -1437,7 +1272,7 @@ ol = find_option(name2, oltop, last); if (ol == NULL) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Exim internal error: missing set flag for %s", name); return (data_block == NULL)? (BOOL *)(ol->value) : - (BOOL *)((uschar *)data_block + (long int)(ol->value)); + (BOOL *)(US data_block + (long int)(ol->value)); } @@ -1862,12 +1697,19 @@ switch (type) int sep_i = -(int)sep_o; const uschar * list = sptr; uschar * s; - uschar * list_o = *str_target; + gstring * list_o = NULL; + + if (*str_target) + { + list_o = string_get(Ustrlen(*str_target) + Ustrlen(sptr)); + list_o = string_cat(list_o, *str_target); + } while ((s = string_nextinlist(&list, &sep_i, NULL, 0))) list_o = string_append_listele(list_o, sep_o, s); + if (list_o) - *str_target = string_copy_malloc(list_o); + *str_target = string_copy_malloc(string_from_gstring(list_o)); } else { @@ -1906,8 +1748,8 @@ switch (type) } else { - chain = (rewrite_rule **)((uschar *)data_block + (long int)(ol2->value)); - flagptr = (int *)((uschar *)data_block + (long int)(ol3->value)); + chain = (rewrite_rule **)(US data_block + (long int)(ol2->value)); + flagptr = (int *)(US data_block + (long int)(ol3->value)); } while ((p = string_nextinlist(CUSS &sptr, &sep, big_buffer, BIG_BUFFER_SIZE))) @@ -1939,7 +1781,7 @@ switch (type) if (data_block == NULL) *((uschar **)(ol2->value)) = ss; else - *((uschar **)((uschar *)data_block + (long int)(ol2->value))) = ss; + *((uschar **)(US data_block + (long int)(ol2->value))) = ss; if (ss != NULL) { @@ -1958,7 +1800,7 @@ switch (type) if (data_block == NULL) *((uid_t *)(ol->value)) = uid; else - *((uid_t *)((uschar *)data_block + (long int)(ol->value))) = uid; + *((uid_t *)(US data_block + (long int)(ol->value))) = uid; /* Set the flag indicating a fixed value is set */ @@ -1980,7 +1822,7 @@ switch (type) if (data_block == NULL) *((gid_t *)(ol2->value)) = pw->pw_gid; else - *((gid_t *)((uschar *)data_block + (long int)(ol2->value))) = pw->pw_gid; + *((gid_t *)(US data_block + (long int)(ol2->value))) = pw->pw_gid; *set_flag = TRUE; } } @@ -2002,7 +1844,7 @@ switch (type) if (data_block == NULL) *((uschar **)(ol2->value)) = ss; else - *((uschar **)((uschar *)data_block + (long int)(ol2->value))) = ss; + *((uschar **)(US data_block + (long int)(ol2->value))) = ss; if (ss != NULL) { @@ -2020,7 +1862,7 @@ switch (type) if (data_block == NULL) *((gid_t *)(ol->value)) = gid; else - *((gid_t *)((uschar *)data_block + (long int)(ol->value))) = gid; + *((gid_t *)(US data_block + (long int)(ol->value))) = gid; *(get_set_flag(name, oltop, last, data_block)) = TRUE; break; @@ -2050,7 +1892,7 @@ switch (type) if (data_block == NULL) *((uid_t **)(ol->value)) = list; else - *((uid_t **)((uschar *)data_block + (long int)(ol->value))) = list; + *((uid_t **)(US data_block + (long int)(ol->value))) = list; p = op; while (count-- > 1) @@ -2091,7 +1933,7 @@ switch (type) if (data_block == NULL) *((gid_t **)(ol->value)) = list; else - *((gid_t **)((uschar *)data_block + (long int)(ol->value))) = list; + *((gid_t **)(US data_block + (long int)(ol->value))) = list; p = op; while (count-- > 1) @@ -2127,7 +1969,7 @@ switch (type) if (data_block == NULL) *((uschar **)(ol2->value)) = sptr; else - *((uschar **)((uschar *)data_block + (long int)(ol2->value))) = sptr; + *((uschar **)(US data_block + (long int)(ol2->value))) = sptr; freesptr = FALSE; break; } @@ -2165,7 +2007,7 @@ switch (type) int bit = 1 << ((ol->type >> 16) & 31); int *ptr = (data_block == NULL)? (int *)(ol->value) : - (int *)((uschar *)data_block + (long int)ol->value); + (int *)(US data_block + (long int)ol->value); if (boolvalue) *ptr |= bit; else *ptr &= ~bit; break; } @@ -2175,7 +2017,7 @@ switch (type) if (data_block == NULL) *((BOOL *)(ol->value)) = boolvalue; else - *((BOOL *)((uschar *)data_block + (long int)(ol->value))) = boolvalue; + *((BOOL *)(US data_block + (long int)(ol->value))) = boolvalue; /* Verify fudge */ @@ -2188,7 +2030,7 @@ switch (type) if (data_block == NULL) *((BOOL *)(ol2->value)) = boolvalue; else - *((BOOL *)((uschar *)data_block + (long int)(ol2->value))) = boolvalue; + *((BOOL *)(US data_block + (long int)(ol2->value))) = boolvalue; } } @@ -2203,7 +2045,7 @@ switch (type) if (data_block == NULL) *((BOOL *)(ol2->value)) = TRUE; else - *((BOOL *)((uschar *)data_block + (long int)(ol2->value))) = TRUE; + *((BOOL *)(US data_block + (long int)(ol2->value))) = TRUE; } } break; @@ -2266,7 +2108,7 @@ switch (type) if (data_block == NULL) *((int *)(ol->value)) = value; else - *((int *)((uschar *)data_block + (long int)(ol->value))) = value; + *((int *)(US data_block + (long int)(ol->value))) = value; break; /* Integer held in K: again, allow octal and hex formats, and suffixes K, M @@ -2316,7 +2158,7 @@ switch (type) if (data_block == NULL) *((int *)(ol->value)) = value; else - *((int *)((uschar *)data_block + (long int)(ol->value))) = value; + *((int *)(US data_block + (long int)(ol->value))) = value; break; /* Fixed-point number: held to 3 decimal places. */ @@ -2336,7 +2178,7 @@ switch (type) /* We get a coverity error here for using count, as it derived from the tainted buffer pointed to by s, as parsed by sscanf(). - By the definition of sscanf we must be aceessing between start + By the definition of sscanf we must be accessing between start and end of s (assuming it is nul-terminated...) so ignore the error. */ /* coverity[tainted_data] */ if (s[count] == '.') @@ -2357,7 +2199,7 @@ switch (type) if (data_block == NULL) *((int *)(ol->value)) = value; else - *((int *)((uschar *)data_block + (long int)(ol->value))) = value; + *((int *)(US data_block + (long int)(ol->value))) = value; break; /* There's a special routine to read time values. */ @@ -2370,7 +2212,7 @@ switch (type) if (data_block == NULL) *((int *)(ol->value)) = value; else - *((int *)((uschar *)data_block + (long int)(ol->value))) = value; + *((int *)(US data_block + (long int)(ol->value))) = value; break; /* A time list is a list of colon-separated times, with the first @@ -2382,7 +2224,7 @@ switch (type) int count = 0; int *list = (data_block == NULL)? (int *)(ol->value) : - (int *)((uschar *)data_block + (long int)(ol->value)); + (int *)(US data_block + (long int)(ol->value)); if (*s != 0) for (count = 1; count <= list[0] - 2; count++) { @@ -2459,10 +2301,10 @@ t /= 24; d = t % 7; w = t/7; -if (w > 0) { sprintf(CS p, "%dw", w); while (*p) p++; } -if (d > 0) { sprintf(CS p, "%dd", d); while (*p) p++; } -if (h > 0) { sprintf(CS p, "%dh", h); while (*p) p++; } -if (m > 0) { sprintf(CS p, "%dm", m); while (*p) p++; } +if (w > 0) p += sprintf(CS p, "%dw", w); +if (d > 0) p += sprintf(CS p, "%dd", d); +if (h > 0) p += sprintf(CS p, "%dh", h); +if (m > 0) p += sprintf(CS p, "%dm", m); if (s > 0 || p == time_buffer) sprintf(CS p, "%ds", s); return time_buffer; @@ -2532,7 +2374,7 @@ if (options_block != NULL) { if ((ol->type & opt_public) == 0) options_block = (void *)(((driver_instance *)options_block)->options_block); - value = (void *)((uschar *)options_block + (long int)value); + value = (void *)(US options_block + (long int)value); } switch(ol->type & opt_mask) @@ -2621,7 +2463,7 @@ switch(ol->type & opt_mask) { void *value2 = ol2->value; if (options_block != NULL) - value2 = (void *)((uschar *)options_block + (long int)value2); + value2 = (void *)(US options_block + (long int)value2); s = *((uschar **)value2); if (!no_labels) printf("%s = ", name); printf("%s\n", (s == NULL)? US"" : string_printing(s)); @@ -2655,7 +2497,7 @@ switch(ol->type & opt_mask) { void *value2 = ol2->value; if (options_block != NULL) - value2 = (void *)((uschar *)options_block + (long int)value2); + value2 = (void *)(US options_block + (long int)value2); s = *((uschar **)value2); if (!no_labels) printf("%s = ", name); printf("%s\n", (s == NULL)? US"" : string_printing(s)); @@ -2750,7 +2592,7 @@ switch(ol->type & opt_mask) { void *value2 = ol2->value; if (options_block != NULL) - value2 = (void *)((uschar *)options_block + (long int)value2); + value2 = (void *)(US options_block + (long int)value2); s = *((uschar **)value2); if (s != NULL) { @@ -3005,7 +2847,6 @@ else if (Ustrcmp(type, "macro") == 0) fprintf(stderr, "exim: permission denied\n"); exit(EXIT_FAILURE); } - if (!macros_builtin_created) macros_create_builtin(); for (m = macros; m; m = m->next) if (!name || Ustrcmp(name, m->name) == 0) { @@ -3219,12 +3060,9 @@ if (pid == 0) exim_setugid(exim_uid, exim_gid, FALSE, US"calling tls_validate_require_cipher"); - errmsg = tls_validate_require_cipher(); - if (errmsg) - { + if ((errmsg = tls_validate_require_cipher())) log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "tls_require_ciphers invalid: %s", errmsg); - } fflush(NULL); _exit(0); } @@ -3340,28 +3178,49 @@ while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))) if (config_file != NULL || errno != ENOENT) break; } -/* Now, once we found and opened our configuration file, we change the directory -to a safe place. Later we change to $spool_directory. */ - -if (Uchdir("/") < 0) - { - perror("exim: chdir `/': "); - exit(EXIT_FAILURE); - } - /* On success, save the name for verification; config_filename is used when logging configuration errors (it changes for .included files) whereas config_main_filename is the name shown by -bP. Failure to open a configuration file is a serious disaster. */ -if (config_file != NULL) +if (config_file) { - uschar *p; + uschar *last_slash = Ustrrchr(filename, '/'); config_filename = config_main_filename = string_copy(filename); - p = Ustrrchr(filename, '/'); - config_main_directory = p ? string_copyn(filename, p - filename) - : string_copy(US"."); + /* The config_main_directory we need for the $config_dir expansion. + config_main_filename we need for $config_file expansion. + And config_dir is the directory of the current configuration, used for + relative .includes. We do need to know it's name, as we change our working + directory later. */ + + if (filename[0] == '/') + config_main_directory = last_slash == filename ? US"/" : string_copyn(filename, last_slash - filename); + else + { + /* relative configuration file name: working dir + / + basename(filename) */ + + uschar buf[PATH_MAX]; + gstring * g; + + if (os_getcwd(buf, PATH_MAX) == NULL) + { + perror("exim: getcwd"); + exit(EXIT_FAILURE); + } + g = string_cat(NULL, buf); + + /* If the dir does not end with a "/", append one */ + if (g->s[g->ptr-1] != '/') + g = string_catn(g, US"/", 1); + + /* If the config file contains a "/", extract the directory part */ + if (last_slash) + g = string_catn(g, filename, last_slash - filename); + + config_main_directory = string_from_gstring(g); + } + config_directory = config_main_directory; } else { @@ -3373,6 +3232,15 @@ else "configuration file %s", filename)); } +/* Now, once we found and opened our configuration file, we change the directory +to a safe place. Later we change to $spool_directory. */ + +if (Uchdir("/") < 0) + { + perror("exim: chdir `/': "); + exit(EXIT_FAILURE); + } + /* Check the status of the file we have opened, if we have retained root privileges and the file isn't /dev/null (which *should* be 0666). */ @@ -3405,6 +3273,11 @@ a macro definition. */ while ((s = get_config_line()) != NULL) { + + if (config_lineno == 1 && Ustrstr(s, "\xef\xbb\xbf") == s) + log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, + "found unexpected BOM (Byte Order Mark)"); + if (isupper(s[0])) read_macro_assignment(s); else if (Ustrncmp(s, "domainlist", 10) == 0) @@ -3723,14 +3596,14 @@ if (tls_dh_max_bits < 1024) "tls_dh_max_bits is too small, must be at least 1024 for interop"); /* If openssl_options is set, validate it */ -if (openssl_options != NULL) +if (openssl_options) { # ifdef USE_GNUTLS log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "openssl_options is set but we're using GnuTLS"); # else long dummy; - if (!(tls_openssl_options_parse(openssl_options, &dummy))) + if (!tls_openssl_options_parse(openssl_options, &dummy)) log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "openssl_options parse error: %s", openssl_options); # endif @@ -3771,7 +3644,7 @@ init_driver(driver_instance *d, driver_info *drivers_available, driver_info *dd; for (dd = drivers_available; dd->driver_name[0] != 0; - dd = (driver_info *)(((uschar *)dd) + size_of_info)) + dd = (driver_info *)((US dd) + size_of_info)) { if (Ustrcmp(d->driver_name, dd->driver_name) == 0) { @@ -3984,7 +3857,7 @@ for (ol = d->info->options; ol < d->info->options + count; ol++) int type = ol->type & opt_mask; if (type != opt_stringptr) continue; options_block = ((ol->type & opt_public) == 0)? d->options_block : (void *)d; - value = *(uschar **)((uschar *)options_block + (long int)(ol->value)); + value = *(uschar **)(US options_block + (long int)(ol->value)); if (value != NULL && (ss = Ustrstr(value, s)) != NULL) { if (ss <= value || (ss[-1] != '$' && ss[-1] != '{') || @@ -4060,14 +3933,14 @@ else if (len == 7 && strncmpic(pp, US"timeout", len) == 0) static int values[] = { 'A', 'M', RTEF_CTOUT, RTEF_CTOUT|'A', RTEF_CTOUT|'M' }; - for (i = 0; i < sizeof(extras)/sizeof(uschar *); i++) + for (i = 0; i < nelem(extras); i++) if (strncmpic(x, extras[i], xlen) == 0) { *more_errno = values[i]; break; } - if (i >= sizeof(extras)/sizeof(uschar *)) + if (i >= nelem(extras)) if (strncmpic(x, US"DNS", xlen) == 0) log_write(0, LOG_MAIN|LOG_PANIC, "\"timeout_dns\" is no longer " "available in retry rules (it has never worked) - treated as " @@ -4286,21 +4159,6 @@ while ((p = get_config_line())) * Initialize authenticators * *************************************************/ -static void -readconf_options_auths(void) -{ -struct auth_info * ai; - -readconf_options_from_list(optionlist_auths, optionlist_auths_size, US"AU"); - -for (ai = auths_available; ai->driver_name[0]; ai++) - { - macro_create(string_sprintf("_DRVR_AUTH_%T", ai->driver_name), US"y", FALSE, TRUE); - readconf_options_from_list(ai->options, (unsigned)*ai->options_count, ai->driver_name); - } -} - - /* Read the authenticators section of the configuration file. Arguments: none @@ -4478,7 +4336,7 @@ while(next_section[0] != 0) { int bit; int first = 0; - int last = sizeof(section_list) / sizeof(uschar *); + int last = nelem(section_list); int mid = last/2; int n = Ustrlen(next_section); @@ -4534,6 +4392,7 @@ save_config_position(const uschar *file, int line) this operates on a global (static) list that holds all the pre-parsed config lines, we do no further processing here, output formatting and honouring of or macros will be done during output */ + static void save_config_line(const uschar* line) { @@ -4632,6 +4491,7 @@ for (i = config_lines; i; i = i->next) } } +#endif /*!MACRO_PREDEF*/ /* vi: aw ai sw=2 */ /* End of readconf.c */