X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3acf26c7e9012515ea2936d1d7aab67652049f46..f988ce57300f2dcb7ddb63f767ef5ebef76b2aa4:/src/src/readconf.c diff --git a/src/src/readconf.c b/src/src/readconf.c index 6bcc50752..55bba4c05 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -22,12 +22,15 @@ static void readconf_options_auths(void); #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; - uschar *filename; + const uschar *filename; + const uschar *directory; FILE *file; int lineno; } config_file_item; @@ -250,7 +253,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 }, @@ -445,6 +448,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 }, @@ -554,6 +558,45 @@ 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. */ + +macro_item * +macro_create(const uschar * name, const uschar * val, + BOOL command_line, BOOL builtin) +{ +unsigned namelen = Ustrlen(name); +macro_item * m = store_get(sizeof(macro_item) + namelen); + +/* fprintf(stderr, "%s: '%s' '%s'\n", __FUNCTION__, name, val) */ +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; + } +m->command_line = command_line; +m->namelen = namelen; +m->replacement = string_copy(val); +Ustrcpy(m->name, name); +return m; +} + + /* This function is called when a line that starts with an upper case letter is encountered. The argument "line" should contain a complete logical line, and start with the first letter of the macro name. The macro name and the @@ -566,14 +609,13 @@ Arguments: Returns: nothing */ -void +static void read_macro_assignment(uschar *s) { uschar name[64]; int namelen = 0; BOOL redef = FALSE; macro_item *m; -macro_item *mlast = NULL; while (isalnum(*s) || *s == '_') { @@ -599,13 +641,13 @@ while (isspace(*s)) s++; just skip this definition. It's an error to attempt to redefine a macro without redef set to TRUE, or to redefine a macro when it hasn't been defined earlier. It is also an error to define a macro whose name begins with the name of a -previously defined macro. Note: it is documented that the other way round -works. */ +previously defined macro. This is the requirement that make using a tree +for macros hard; we must check all macros for the substring. Perhaps a +sorted list, and a bsearch, would work? +Note: it is documented that the other way round works. */ -for (m = macros; m != NULL; m = m->next) +for (m = macros; m; m = m->next) { - int len = Ustrlen(m->name); - if (Ustrcmp(m->name, name) == 0) { if (!m->command_line && !redef) @@ -614,7 +656,7 @@ for (m = macros; m != NULL; m = m->next) break; } - if (len < namelen && Ustrstr(name, m->name) != NULL) + if (m->namelen < namelen && Ustrstr(name, m->name) != NULL) log_write(0, LOG_CONFIG|LOG_PANIC_DIE, "\"%s\" cannot be defined as " "a macro because previously defined macro \"%s\" is a substring", name, m->name); @@ -622,49 +664,243 @@ for (m = macros; m != NULL; m = m->next) /* We cannot have this test, because it is documented that a substring macro is permitted (there is even an example). * - * if (len > namelen && Ustrstr(m->name, name) != NULL) + * if (m->namelen > namelen && Ustrstr(m->name, name) != NULL) * log_write(0, LOG_CONFIG|LOG_PANIC_DIE, "\"%s\" cannot be defined as " * "a macro because it is a substring of previously defined macro \"%s\"", * name, m->name); */ - - mlast = m; } /* Check for an overriding command-line definition. */ -if (m != NULL && m->command_line) return; +if (m && m->command_line) return; /* Redefinition must refer to an existing macro. */ if (redef) - { - if (m == NULL) + if (m) + 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. 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. */ +/* We have a new definition. */ else - { - m = store_get(sizeof(macro_item) + namelen); - if (macros == NULL) macros = m; else mlast->next = m; - Ustrncpy(m->name, name, namelen); - m->name[namelen] = 0; - m->next = NULL; - m->command_line = FALSE; - } + (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 TCP_FASTOPEN + macro_create(US"_HAVE_TCP_FASTOPEN", 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 -/* Set the value of the new or redefined macro */ +#ifdef LOOKUP_LSEARCH + macro_create(US"_HAVE_LOOKUP_LSEARCH", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_CDB + macro_create(US"_HAVE_LOOKUP_CDB", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_DBM + macro_create(US"_HAVE_LOOKUP_DBM", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_DNSDB + macro_create(US"_HAVE_LOOKUP_DNSDB", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_DSEARCH + macro_create(US"_HAVE_LOOKUP_DSEARCH", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_IBASE + macro_create(US"_HAVE_LOOKUP_IBASE", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_LDAP + macro_create(US"_HAVE_LOOKUP_LDAP", US"y", FALSE, TRUE); +#endif +#ifdef EXPERIMENTAL_LMDB + macro_create(US"_HAVE_LOOKUP_LMDB", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_MYSQL + macro_create(US"_HAVE_LOOKUP_MYSQL", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_NIS + macro_create(US"_HAVE_LOOKUP_NIS", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_NISPLUS + macro_create(US"_HAVE_LOOKUP_NISPLUS", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_ORACLE + macro_create(US"_HAVE_LOOKUP_ORACLE", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_PASSWD + macro_create(US"_HAVE_LOOKUP_PASSWD", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_PGSQL + macro_create(US"_HAVE_LOOKUP_PGSQL", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_REDIS + macro_create(US"_HAVE_LOOKUP_REDIS", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_SQLITE + macro_create(US"_HAVE_LOOKUP_SQLITE", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_TESTDB + macro_create(US"_HAVE_LOOKUP_TESTDB", US"y", FALSE, TRUE); +#endif +#ifdef LOOKUP_WHOSON + macro_create(US"_HAVE_LOOKUP_WHOSON", US"y", FALSE, TRUE); +#endif -m->replacement = string_copy(s); +#ifdef TRANSPORT_APPENDFILE +# ifdef SUPPORT_MAILDIR + macro_create(US"_HAVE_TRANSPORT_APPEND_MAILDIR", US"y", FALSE, TRUE); +# endif +# ifdef SUPPORT_MAILSTORE + macro_create(US"_HAVE_TRANSPORT_APPEND_MAILSTORE", US"y", FALSE, TRUE); +# endif +# ifdef SUPPORT_MBX + macro_create(US"_HAVE_TRANSPORT_APPEND_MBX", US"y", FALSE, TRUE); +# endif +#endif } +void +readconf_options_from_list(optionlist * opts, unsigned nopt, const uschar * section, uschar * group) +{ +int i; +const uschar * s; +/* The 'previously-defined-substring' rule for macros in config file +lines is done so for these builtin macros: we know that the table +we source from is in strict alpha order, hence the builtins portion +of the macros list is in reverse-alpha (we prepend them) - so longer +macros that have substrings are always discovered first during +expansion. */ + +for (i = 0; i < nopt; i++) if (*(s = opts[i].name) && *s != '*') + if (group) + macro_create(string_sprintf("_OPT_%T_%T_%T", section, group, s), US"y", FALSE, TRUE); + else + macro_create(string_sprintf("_OPT_%T_%T", section, s), US"y", FALSE, TRUE); +} + + +static void +readconf_options(void) +{ +readconf_options_from_list(optionlist_config, nelem(optionlist_config), US"MAIN", NULL); +readconf_options_routers(); +readconf_options_transports(); +readconf_options_auths(); +} + +static void +macros_create_builtin(void) +{ +readconf_features(); +readconf_options(); +macros_builtin_created = TRUE; +} /************************************************* @@ -711,6 +947,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) @@ -776,11 +1013,28 @@ 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. */ + + 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') + { +/* fprintf(stderr, "%s: builtins create triggered by '%s'\n", __FUNCTION__, s); */ + macros_create_builtin(); + break; + } + } + /* For each defined macro, scan the line (from after XXX= if present), replacing all occurrences of the macro. */ macro_found = FALSE; - for (m = macros; m != NULL; m = m->next) + for (m = macros; m; m = m->next) { uschar *p, *pp; uschar *t = s; @@ -788,12 +1042,12 @@ for (;;) while ((p = Ustrstr(t, m->name)) != NULL) { int moveby; - int namelen = Ustrlen(m->name); int replen = Ustrlen(m->replacement); +/* fprintf(stderr, "%s: matched '%s' in '%s'\n", __FUNCTION__, m->name, t) */ /* Expand the buffer if necessary */ - while (newlen - namelen + replen + 1 > big_buffer_size) + while (newlen - m->namelen + replen + 1 > big_buffer_size) { int newsize = big_buffer_size + BIG_BUFFER_SIZE; uschar *newbuffer = store_malloc(newsize); @@ -811,9 +1065,8 @@ for (;;) copying in the replacement text. Don't rescan the replacement for this same macro. */ - pp = p + namelen; - moveby = replen - namelen; - if (moveby != 0) + pp = p + m->namelen; + if ((moveby = replen - m->namelen) != 0) { memmove(p + replen, pp, (big_buffer + newlen) - pp + 1); newlen += moveby; @@ -917,9 +1170,19 @@ 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 + { + int offset = 0; + int size = 0; + ss = string_append(NULL, &size, &offset, 3, config_directory, "/", ss); + ss[offset] = '\0'; /* string_append() does not zero terminate the string! */ + } if (include_if_exists != 0 && (Ustat(ss, &statbuf) != 0)) continue; @@ -930,6 +1193,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"))) @@ -937,6 +1201,7 @@ for (;;) "configuration file %s", ss); config_filename = string_copy(ss); + config_directory = string_copyn(ss, (const uschar*) strrchr(ss, '/') - ss); config_lineno = 0; continue; } @@ -2101,6 +2366,11 @@ switch (type) if (value < 0) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "integer \"%s\" is too large (overflow)", s); + /* 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 accessing between start + and end of s (assuming it is nul-terminated...) so ignore the error. */ + /* coverity[tainted_data] */ if (s[count] == '.') { int d = 100; @@ -2767,19 +3037,18 @@ else if (Ustrcmp(type, "macro") == 0) fprintf(stderr, "exim: permission denied\n"); exit(EXIT_FAILURE); } - for (m = macros; m != NULL; m = m->next) - { - if (name == NULL || Ustrcmp(name, m->name) == 0) + if (!macros_builtin_created) macros_create_builtin(); + for (m = macros; m; m = m->next) + if (!name || Ustrcmp(name, m->name) == 0) { if (names_only) printf("%s\n", CS m->name); else printf("%s=%s\n", CS m->name, CS m->replacement); - if (name != NULL) + if (name) return; } - } - if (name != NULL) + if (name) printf("%s %s not found\n", type, name); return; } @@ -3009,196 +3278,6 @@ return status == 0; -/*************************************************/ -/* Create compile-time feature macros */ -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 - read_macro_assignment(US"_HAVE_CRYPTEQ=y"); -#endif -#if HAVE_ICONV - read_macro_assignment(US"_HAVE_ICONV=y"); -#endif -#if HAVE_IPV6 - read_macro_assignment(US"_HAVE_IPV6=y"); -#endif -#ifdef HAVE_SETCLASSRESOURCES - read_macro_assignment(US"_HAVE_SETCLASSRESOURCES=y"); -#endif -#ifdef SUPPORT_PAM - read_macro_assignment(US"_HAVE_PAM=y"); -#endif -#ifdef EXIM_PERL - read_macro_assignment(US"_HAVE_PERL=y"); -#endif -#ifdef EXPAND_DLFUNC - read_macro_assignment(US"_HAVE_DLFUNC=y"); -#endif -#ifdef USE_TCP_WRAPPERS - read_macro_assignment(US"_HAVE_TCPWRAPPERS=y"); -#endif -#ifdef SUPPORT_TLS - read_macro_assignment(US"_HAVE_TLS=y"); -# ifdef USE_GNUTLS - read_macro_assignment(US"_HAVE_GNUTLS=y"); -# else - read_macro_assignment(US"_HAVE_OPENSSL=y"); -# endif -#endif -#ifdef SUPPORT_TRANSLATE_IP_ADDRESS - read_macro_assignment(US"_HAVE_TRANSLATE_IP_ADDRESS=y"); -#endif -#ifdef SUPPORT_MOVE_FROZEN_MESSAGES - read_macro_assignment(US"_HAVE_MOVE_FROZEN_MESSAGES=y"); -#endif -#ifdef WITH_CONTENT_SCAN - read_macro_assignment(US"_HAVE_CONTENT_SCANNING=y"); -#endif -#ifndef DISABLE_DKIM - read_macro_assignment(US"_HAVE_DKIM=y"); -#endif -#ifndef DISABLE_DNSSEC - read_macro_assignment(US"_HAVE_DNSSEC=y"); -#endif -#ifndef DISABLE_EVENT - read_macro_assignment(US"_HAVE_EVENT=y"); -#endif -#ifdef SUPPORT_I18N - read_macro_assignment(US"_HAVE_I18N=y"); -#endif -#ifndef DISABLE_OCSP - read_macro_assignment(US"_HAVE_OCSP=y"); -#endif -#ifndef DISABLE_PRDR - read_macro_assignment(US"_HAVE_PRDR=y"); -#endif -#ifdef SUPPORT_PROXY - read_macro_assignment(US"_HAVE_PROXY=y"); -#endif -#ifdef SUPPORT_SOCKS - read_macro_assignment(US"_HAVE_SOCKS=y"); -#endif -#ifdef EXPERIMENTAL_LMDB - read_macro_assignment(US"_HAVE_LMDB=y"); -#endif -#ifdef EXPERIMENTAL_SPF - read_macro_assignment(US"_HAVE_SPF=y"); -#endif -#ifdef EXPERIMENTAL_SRS - read_macro_assignment(US"_HAVE_SRS=y"); -#endif -#ifdef EXPERIMENTAL_BRIGHTMAIL - read_macro_assignment(US"_HAVE_BRIGHTMAIL=y"); -#endif -#ifdef EXPERIMENTAL_DANE - read_macro_assignment(US"_HAVE_DANE=y"); -#endif -#ifdef EXPERIMENTAL_DCC - read_macro_assignment(US"_HAVE_DCC=y"); -#endif -#ifdef EXPERIMENTAL_DMARC - read_macro_assignment(US"_HAVE_DMARC=y"); -#endif -#ifdef EXPERIMENTAL_DSN_INFO - read_macro_assignment(US"_HAVE_DSN_INFO=y"); -#endif - -#ifdef LOOKUP_LSEARCH - read_macro_assignment(US"_HAVE_LKUP_LSEARCH=y"); -#endif -#ifdef LOOKUP_CDB - read_macro_assignment(US"_HAVE_LKUP_CDB=y"); -#endif -#ifdef LOOKUP_DBM - read_macro_assignment(US"_HAVE_LKUP_DBM=y"); -#endif -#ifdef LOOKUP_DNSDB - read_macro_assignment(US"_HAVE_LKUP_DNSDB=y"); -#endif -#ifdef LOOKUP_DSEARCH - read_macro_assignment(US"_HAVE_LKUP_DSEARCH=y"); -#endif -#ifdef LOOKUP_IBASE - read_macro_assignment(US"_HAVE_LKUP_IBASE=y"); -#endif -#ifdef LOOKUP_LDAP - read_macro_assignment(US"_HAVE_LKUP_LDAP=y"); -#endif -#ifdef EXPERIMENTAL_LMDB - read_macro_assignment(US"_HAVE_LKUP_LMDB=y"); -#endif -#ifdef LOOKUP_MYSQL - read_macro_assignment(US"_HAVE_LKUP_MYSQL=y"); -#endif -#ifdef LOOKUP_NIS - read_macro_assignment(US"_HAVE_LKUP_NIS=y"); -#endif -#ifdef LOOKUP_NISPLUS - read_macro_assignment(US"_HAVE_LKUP_NISPLUS=y"); -#endif -#ifdef LOOKUP_ORACLE - read_macro_assignment(US"_HAVE_LKUP_ORACLE=y"); -#endif -#ifdef LOOKUP_PASSWD - read_macro_assignment(US"_HAVE_LKUP_PASSWD=y"); -#endif -#ifdef LOOKUP_PGSQL - read_macro_assignment(US"_HAVE_LKUP_PGSQL=y"); -#endif -#ifdef LOOKUP_REDIS - read_macro_assignment(US"_HAVE_LKUP_REDIS=y"); -#endif -#ifdef LOOKUP_SQLITE - read_macro_assignment(US"_HAVE_LKUP_SQLITE=y"); -#endif -#ifdef LOOKUP_TESTDB - read_macro_assignment(US"_HAVE_LKUP_TESTDB=y"); -#endif -#ifdef LOOKUP_WHOSON - read_macro_assignment(US"_HAVE_LKUP_WHOSON=y"); -#endif - -#ifdef TRANSPORT_APPENDFILE -# ifdef SUPPORT_MAILDIR - read_macro_assignment(US"_HAVE_TPT_APPEND_MAILDR=y"); -# endif -# ifdef SUPPORT_MAILSTORE - read_macro_assignment(US"_HAVE_TPT_APPEND_MAILSTORE=y"); -# endif -# ifdef SUPPORT_MBX - read_macro_assignment(US"_HAVE_TPT_APPEND_MBX=y"); -# endif -#endif -} - - -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 != '*') - read_macro_assignment(string_sprintf("_OPT_%T_%T=y", group, s)); -} - - -void -readconf_options(void) -{ -readconf_options_from_list(optionlist_config, nelem(optionlist_config), US"MAIN"); -readconf_options_routers(); -readconf_options_transports(); -readconf_options_auths(); -} - - /************************************************* * Read main configuration options * *************************************************/ @@ -3237,8 +3316,7 @@ const uschar *list = config_main_filelist; /* Loop through the possible file names */ -while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)) - != NULL) +while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))) { /* Cut out all the fancy processing unless specifically wanted */ @@ -3294,28 +3372,50 @@ 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) */ + + char buf[PATH_MAX]; + int offset = 0; + int size = 0; + + if (getcwd(buf, PATH_MAX) == NULL) + { + perror("exim: getcwd"); + exit(EXIT_FAILURE); + } + config_main_directory = string_cat(NULL, &size, &offset, buf); + + /* If the dir does not end with a "/", append one */ + if (config_main_directory[offset-1] != '/') + config_main_directory = string_catn(config_main_directory, &size, &offset, US"/", 1); + + /* If the config file contains a "/", extract the directory part */ + if (last_slash) + config_main_directory = string_catn(config_main_directory, &size, &offset, filename, last_slash - filename); + + config_main_directory[offset] = '\0'; + } + config_directory = config_main_directory; } else { @@ -3327,6 +3427,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). */ @@ -4245,12 +4354,12 @@ readconf_options_auths(void) { struct auth_info * ai; -readconf_options_from_list(optionlist_auths, optionlist_auths_size, US"AU"); +readconf_options_from_list(optionlist_auths, optionlist_auths_size, US"AUTHENTICATORS", NULL); for (ai = auths_available; ai->driver_name[0]; ai++) { - read_macro_assignment(string_sprintf("_DRVR_AUTH_%T=y", ai->driver_name)); - readconf_options_from_list(ai->options, (unsigned)*ai->options_count, ai->driver_name); + macro_create(string_sprintf("_DRIVER_AUTHENTICATOR_%T", ai->driver_name), US"y", FALSE, TRUE); + readconf_options_from_list(ai->options, (unsigned)*ai->options_count, US"AUTHENTICATOR", ai->driver_name); } }