X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/44bc8f0c2f3576b46bd6df1b818cb29eaf84df5b..4945f557f5760ca26b67a5d334364673a445f7cf:/src/src/readconf.c diff --git a/src/src/readconf.c b/src/src/readconf.c index a1591e2a1..29181cbcb 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -17,6 +17,7 @@ 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 @@ -488,8 +489,7 @@ static optionlist optionlist_config[] = { { "write_rejectlog", opt_bool, &write_rejectlog } }; -static int optionlist_config_size = - sizeof(optionlist_config)/sizeof(optionlist); +static int optionlist_config_size = nelem(optionlist_config); @@ -514,10 +514,10 @@ int i; router_instance *r; transport_instance *t; -for (i = 0; i < optionlist_config_size; i++) +for (i = 0; i < nelem(optionlist_config); i++) if (p == optionlist_config[i].value) return US optionlist_config[i].name; -for (r = routers; r != NULL; r = r->next) +for (r = routers; r; r = r->next) { router_info *ri = r->info; for (i = 0; i < *ri->options_count; i++) @@ -528,7 +528,7 @@ for (r = routers; r != NULL; r = r->next) } } -for (t = transports; t != NULL; t = t->next) +for (t = transports; t; t = t->next) { transport_info *ti = t->info; for (i = 0; i < *ti->options_count; i++) @@ -566,7 +566,7 @@ Arguments: Returns: nothing */ -static void +void read_macro_assignment(uschar *s) { uschar name[64]; @@ -932,10 +932,10 @@ for (;;) save->filename = config_filename; save->lineno = config_lineno; - config_file = Ufopen(ss, "rb"); - if (config_file == NULL) + if (!(config_file = Ufopen(ss, "rb"))) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "failed to open included " "configuration file %s", ss); + config_filename = string_copy(ss); config_lineno = 0; continue; @@ -1163,9 +1163,10 @@ while (last > first) { int middle = (first + last)/2; int c = Ustrcmp(name, ol[middle].name); + if (c == 0) return ol + middle; - else if (c > 0) first = middle + 1; - else last = middle; + else if (c > 0) first = middle + 1; + else last = middle; } return NULL; } @@ -1462,7 +1463,6 @@ int intbase = 0; uschar *inttype = US""; uschar *sptr; uschar *s = buffer; -uschar *saved_condition, *strtemp; uschar **str_target; uschar name[64]; uschar name2[64]; @@ -1509,9 +1509,7 @@ if (Ustrncmp(name, "not_", 4) == 0) /* Search the list for the given name. A non-existent name, or an option that is set twice, is a disaster. */ -ol = find_option(name + offset, oltop, last); - -if (ol == NULL) +if (!(ol = find_option(name + offset, oltop, last))) { if (unknown_txt == NULL) return FALSE; log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, CS unknown_txt, name); @@ -1599,19 +1597,18 @@ switch (type) control block and flags word. */ case opt_stringptr: - if (data_block == NULL) - str_target = (uschar **)(ol->value); - else - str_target = (uschar **)((uschar *)data_block + (long int)(ol->value)); + str_target = data_block ? USS (US data_block + (long int)(ol->value)) + : USS (ol->value); if (ol->type & opt_rep_con) { + uschar * saved_condition; /* We already have a condition, we're conducting a crude hack to let multiple condition rules be chained together, despite storing them in text form. */ - saved_condition = *str_target; - strtemp = string_sprintf("${if and{{bool_lax{%s}}{bool_lax{%s}}}}", - saved_condition, sptr); - *str_target = string_copy_malloc(strtemp); + *str_target = string_copy_malloc( (saved_condition = *str_target) + ? string_sprintf("${if and{{bool_lax{%s}}{bool_lax{%s}}}}", + saved_condition, sptr) + : sptr); /* TODO(pdp): there is a memory leak here and just below when we set 3 or more conditions; I still don't understand the store mechanism enough to know @@ -1647,10 +1644,10 @@ switch (type) break; case opt_rewrite: - if (data_block == NULL) - *((uschar **)(ol->value)) = sptr; + if (data_block) + *USS (US data_block + (long int)(ol->value)) = sptr; else - *((uschar **)((uschar *)data_block + (long int)(ol->value))) = sptr; + *USS (ol->value) = sptr; freesptr = FALSE; if (type == opt_rewrite) { @@ -1985,7 +1982,7 @@ switch (type) inttype = US"octal "; /* Integer: a simple(ish) case; allow octal and hex formats, and - suffixes K and M. The different types affect output, not input. */ + suffixes K, M and G. The different types affect output, not input. */ case opt_mkint: case opt_int: @@ -2001,7 +1998,6 @@ switch (type) inttype, name); if (errno != ERANGE) - { if (tolower(*endptr) == 'k') { if (lvalue > INT_MAX/1024 || lvalue < INT_MIN/1024) errno = ERANGE; @@ -2015,7 +2011,13 @@ switch (type) else lvalue *= 1024*1024; endptr++; } - } + else if (tolower(*endptr) == 'g') + { + if (lvalue > INT_MAX/(1024*1024*1024) || lvalue < INT_MIN/(1024*1024*1024)) + errno = ERANGE; + else lvalue *= 1024*1024*1024; + endptr++; + } if (errno == ERANGE || lvalue > INT_MAX || lvalue < INT_MIN) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, @@ -2034,8 +2036,8 @@ switch (type) *((int *)((uschar *)data_block + (long int)(ol->value))) = value; break; - /* Integer held in K: again, allow octal and hex formats, and suffixes K and - M. */ + /* Integer held in K: again, allow octal and hex formats, and suffixes K, M + and G. */ /*XXX consider moving to int_eximarith_t (but mind the overflow test 0415) */ case opt_Kint: @@ -2049,22 +2051,26 @@ switch (type) inttype, name); if (errno != ERANGE) - { - if (tolower(*endptr) == 'm') + if (tolower(*endptr) == 'g') { - if (value > INT_MAX/1024 || value < INT_MIN/1024) errno = ERANGE; - else value *= 1024; + if (value > INT_MAX/(1024*1024) || value < INT_MIN/(1024*1024)) + errno = ERANGE; + else + value *= 1024*1024; endptr++; } - else if (tolower(*endptr) == 'k') + else if (tolower(*endptr) == 'm') { + if (value > INT_MAX/1024 || value < INT_MIN/1024) + errno = ERANGE; + else + value *= 1024; endptr++; } + else if (tolower(*endptr) == 'k') + endptr++; else - { value = (value + 512)/1024; - } - } if (errno == ERANGE) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "absolute value of integer \"%s\" is too large (overflow)", s); @@ -2609,8 +2615,8 @@ if (type == NULL) return; } - if ( Ustrcmp(name, "configure_file") == 0 - ||Ustrcmp(name, "config_file") == 0) + if ( Ustrcmp(name, "configure_file") == 0 + || Ustrcmp(name, "config_file") == 0) { printf("%s\n", CS config_main_filename); return; @@ -2619,11 +2625,11 @@ if (type == NULL) if (Ustrcmp(name, "all") == 0) { for (ol = optionlist_config; - ol < optionlist_config + optionlist_config_size; ol++) + ol < optionlist_config + nelem(optionlist_config); ol++) { if ((ol->type & opt_hidden) == 0) print_ol(ol, US ol->name, NULL, - optionlist_config, optionlist_config_size, + optionlist_config, nelem(optionlist_config), no_labels); } return; @@ -2721,8 +2727,8 @@ if (type == NULL) else { - print_ol(find_option(name, optionlist_config, optionlist_config_size), - name, NULL, optionlist_config, optionlist_config_size, no_labels); + print_ol(find_option(name, optionlist_config, nelem(optionlist_config)), + name, NULL, optionlist_config, nelem(optionlist_config), no_labels); return; } } @@ -3003,6 +3009,196 @@ 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 * *************************************************/ @@ -4044,6 +4240,21 @@ 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++) + { + 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); + } +} + + /* Read the authenticators section of the configuration file. Arguments: none @@ -4054,6 +4265,7 @@ static void auths_init(void) { auth_instance *au, *bu; + readconf_driver_init(US"authenticator", (driver_instance **)(&auths), /* chain anchor */ (driver_info *)auths_available, /* available drivers */