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
{ "write_rejectlog", opt_bool, &write_rejectlog }
};
-static int optionlist_config_size =
- sizeof(optionlist_config)/sizeof(optionlist);
+static int optionlist_config_size = nelem(optionlist_config);
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++)
}
}
-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++)
Returns: nothing
*/
-static void
+void
read_macro_assignment(uschar *s)
{
uschar name[64];
{
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;
}
uschar *inttype = US"";
uschar *sptr;
uschar *s = buffer;
-uschar *saved_condition, *strtemp;
uschar **str_target;
uschar name[64];
uschar name2[64];
/* 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);
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
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)
{
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;
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;
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;
}
}
/*************************************************/
/* Create compile-time feature macros */
-static void
+void
readconf_features(void)
{
/* Probably we could work out a static initialiser for wherever
due to conflicts with other common macros. */
#ifdef SUPPORT_CRYPTEQ
- read_macro_assignment("_HAVE_CRYPTEQ=y");
+ read_macro_assignment(US"_HAVE_CRYPTEQ=y");
#endif
#if HAVE_ICONV
- read_macro_assignment("_HAVE_ICONV=y");
+ read_macro_assignment(US"_HAVE_ICONV=y");
#endif
#if HAVE_IPV6
- read_macro_assignment("_HAVE_IPV6=y");
+ read_macro_assignment(US"_HAVE_IPV6=y");
#endif
#ifdef HAVE_SETCLASSRESOURCES
- read_macro_assignment("_HAVE_SETCLASSRESOURCES=y");
+ read_macro_assignment(US"_HAVE_SETCLASSRESOURCES=y");
#endif
#ifdef SUPPORT_PAM
- read_macro_assignment("_HAVE_PAM=y");
+ read_macro_assignment(US"_HAVE_PAM=y");
#endif
#ifdef EXIM_PERL
- read_macro_assignment("_HAVE_PERL=y");
+ read_macro_assignment(US"_HAVE_PERL=y");
#endif
#ifdef EXPAND_DLFUNC
- read_macro_assignment("_HAVE_DLFUNC=y");
+ read_macro_assignment(US"_HAVE_DLFUNC=y");
#endif
#ifdef USE_TCP_WRAPPERS
- read_macro_assignment("_HAVE_TCPWRAPPERS=y");
+ read_macro_assignment(US"_HAVE_TCPWRAPPERS=y");
#endif
#ifdef SUPPORT_TLS
- read_macro_assignment("_HAVE_TLS=y");
+ read_macro_assignment(US"_HAVE_TLS=y");
# ifdef USE_GNUTLS
- read_macro_assignment("_HAVE_GNUTLS=y");
+ read_macro_assignment(US"_HAVE_GNUTLS=y");
# else
- read_macro_assignment("_HAVE_OPENSSL=y");
+ read_macro_assignment(US"_HAVE_OPENSSL=y");
# endif
#endif
#ifdef SUPPORT_TRANSLATE_IP_ADDRESS
- read_macro_assignment("_HAVE_TRANSLATE_IP_ADDRESS=y");
+ read_macro_assignment(US"_HAVE_TRANSLATE_IP_ADDRESS=y");
#endif
#ifdef SUPPORT_MOVE_FROZEN_MESSAGES
- read_macro_assignment("_HAVE_MOVE_FROZEN_MESSAGES=y");
+ read_macro_assignment(US"_HAVE_MOVE_FROZEN_MESSAGES=y");
#endif
#ifdef WITH_CONTENT_SCAN
- read_macro_assignment("_HAVE_CONTENT_SCANNING=y");
+ read_macro_assignment(US"_HAVE_CONTENT_SCANNING=y");
#endif
#ifndef DISABLE_DKIM
- read_macro_assignment("_HAVE_DKIM=y");
+ read_macro_assignment(US"_HAVE_DKIM=y");
#endif
#ifndef DISABLE_DNSSEC
- read_macro_assignment("_HAVE_DNSSEC=y");
+ read_macro_assignment(US"_HAVE_DNSSEC=y");
#endif
#ifndef DISABLE_EVENT
- read_macro_assignment("_HAVE_Event=y");
+ read_macro_assignment(US"_HAVE_Event=y");
#endif
#ifdef SUPPORT_I18N
- read_macro_assignment("_HAVE_I18N=y");
+ read_macro_assignment(US"_HAVE_I18N=y");
#endif
#ifndef DISABLE_OCSP
- read_macro_assignment("_HAVE_OCSP=y");
+ read_macro_assignment(US"_HAVE_OCSP=y");
#endif
#ifndef DISABLE_PRDR
- read_macro_assignment("_HAVE_PRDR=y");
+ read_macro_assignment(US"_HAVE_PRDR=y");
#endif
#ifdef SUPPORT_PROXY
- read_macro_assignment("_HAVE_PROXY=y");
+ read_macro_assignment(US"_HAVE_PROXY=y");
#endif
#ifdef SUPPORT_SOCKS
- read_macro_assignment("_HAVE_SOCKS=y");
+ read_macro_assignment(US"_HAVE_SOCKS=y");
#endif
#ifdef EXPERIMENTAL_LMDB
- read_macro_assignment("_HAVE_LMDB=y");
+ read_macro_assignment(US"_HAVE_LMDB=y");
#endif
#ifdef EXPERIMENTAL_SPF
- read_macro_assignment("_HAVE_SPF=y");
+ read_macro_assignment(US"_HAVE_SPF=y");
#endif
#ifdef EXPERIMENTAL_SRS
- read_macro_assignment("_HAVE_SRS=y");
+ read_macro_assignment(US"_HAVE_SRS=y");
#endif
#ifdef EXPERIMENTAL_BRIGHTMAIL
- read_macro_assignment("_HAVE_BRIGHTMAIL=y");
+ read_macro_assignment(US"_HAVE_BRIGHTMAIL=y");
#endif
#ifdef EXPERIMENTAL_DANE
- read_macro_assignment("_HAVE_DANE=y");
+ read_macro_assignment(US"_HAVE_DANE=y");
#endif
#ifdef EXPERIMENTAL_DCC
- read_macro_assignment("_HAVE_DCC=y");
+ read_macro_assignment(US"_HAVE_DCC=y");
#endif
#ifdef EXPERIMENTAL_DMARC
- read_macro_assignment("_HAVE_DMARC=y");
+ read_macro_assignment(US"_HAVE_DMARC=y");
#endif
#ifdef EXPERIMENTAL_DSN_INFO
- read_macro_assignment("_HAVE_DSN_INFO=y");
+ read_macro_assignment(US"_HAVE_DSN_INFO=y");
#endif
#ifdef LOOKUP_LSEARCH
- read_macro_assignment("_HAVE_LKUP_LSEARCH=y");
+ read_macro_assignment(US"_HAVE_LKUP_LSEARCH=y");
#endif
#ifdef LOOKUP_CDB
- read_macro_assignment("_HAVE_LKUP_CDB=y");
+ read_macro_assignment(US"_HAVE_LKUP_CDB=y");
#endif
#ifdef LOOKUP_DBM
- read_macro_assignment("_HAVE_LKUP_DBM=y");
+ read_macro_assignment(US"_HAVE_LKUP_DBM=y");
#endif
#ifdef LOOKUP_DNSDB
- read_macro_assignment("_HAVE_LKUP_DNSDB=y");
+ read_macro_assignment(US"_HAVE_LKUP_DNSDB=y");
#endif
#ifdef LOOKUP_DSEARCH
- read_macro_assignment("_HAVE_LKUP_DSEARCH=y");
+ read_macro_assignment(US"_HAVE_LKUP_DSEARCH=y");
#endif
#ifdef LOOKUP_IBASE
- read_macro_assignment("_HAVE_LKUP_IBASE=y");
+ read_macro_assignment(US"_HAVE_LKUP_IBASE=y");
#endif
#ifdef LOOKUP_LDAP
- read_macro_assignment("_HAVE_LKUP_LDAP=y");
+ read_macro_assignment(US"_HAVE_LKUP_LDAP=y");
#endif
#ifdef EXPERIMENTAL_LMDB
- read_macro_assignment("_HAVE_LKUP_LMDB=y");
+ read_macro_assignment(US"_HAVE_LKUP_LMDB=y");
#endif
#ifdef LOOKUP_MYSQL
- read_macro_assignment("_HAVE_LKUP_MYSQL=y");
+ read_macro_assignment(US"_HAVE_LKUP_MYSQL=y");
#endif
#ifdef LOOKUP_NIS
- read_macro_assignment("_HAVE_LKUP_NIS=y");
+ read_macro_assignment(US"_HAVE_LKUP_NIS=y");
#endif
#ifdef LOOKUP_NISPLUS
- read_macro_assignment("_HAVE_LKUP_NISPLUS=y");
+ read_macro_assignment(US"_HAVE_LKUP_NISPLUS=y");
#endif
#ifdef LOOKUP_ORACLE
- read_macro_assignment("_HAVE_LKUP_ORACLE=y");
+ read_macro_assignment(US"_HAVE_LKUP_ORACLE=y");
#endif
#ifdef LOOKUP_PASSWD
- read_macro_assignment("_HAVE_LKUP_PASSWD=y");
+ read_macro_assignment(US"_HAVE_LKUP_PASSWD=y");
#endif
#ifdef LOOKUP_PGSQL
- read_macro_assignment("_HAVE_LKUP_PGSQL=y");
+ read_macro_assignment(US"_HAVE_LKUP_PGSQL=y");
#endif
#ifdef LOOKUP_REDIS
- read_macro_assignment("_HAVE_LKUP_REDIS=y");
+ read_macro_assignment(US"_HAVE_LKUP_REDIS=y");
#endif
#ifdef LOOKUP_SQLITE
- read_macro_assignment("_HAVE_LKUP_SQLITE=y");
+ read_macro_assignment(US"_HAVE_LKUP_SQLITE=y");
#endif
#ifdef LOOKUP_TESTDB
- read_macro_assignment("_HAVE_LKUP_TESTDB=y");
+ read_macro_assignment(US"_HAVE_LKUP_TESTDB=y");
#endif
#ifdef LOOKUP_WHOSON
- read_macro_assignment("_HAVE_LKUP_WHOSON=y");
-#endif
-
-#ifdef AUTH_CRAM_MD5
- read_macro_assignment("_HAVE_AUTH_CRAM_MD5=y");
-#endif
-#ifdef AUTH_CYRUS_SASL
- read_macro_assignment("_HAVE_AUTH_CYRUS_SASL=y");
-#endif
-#ifdef AUTH_DOVECOT
- read_macro_assignment("_HAVE_AUTH_DOVECOT=y");
-#endif
-#ifdef AUTH_GSASL
- read_macro_assignment("_HAVE_AUTH_GSASL=y");
-#endif
-#ifdef AUTH_HEIMDAL_GSSAPI
- read_macro_assignment("_HAVE_AUTH_HEIMDAL_GSSAPI=y");
-#endif
-#ifdef AUTH_PLAINTEXT
- read_macro_assignment("_HAVE_AUTH_PLAINTEXT=y");
-#endif
-#ifdef AUTH_SPA
- read_macro_assignment("_HAVE_AUTH_SPA=y");
-#endif
-#ifdef AUTH_TLS
- read_macro_assignment("_HAVE_AUTH_TLS=y");
-#endif
-
-#ifdef ROUTER_ACCEPT
- read_macro_assignment("_HAVE_RTR_ACCEPT=y");
-#endif
-#ifdef ROUTER_DNSLOOKUP
- read_macro_assignment("_HAVE_RTR_DNSLOOKUP=y");
-#endif
-#ifdef ROUTER_IPLITERAL
- read_macro_assignment("_HAVE_RTR_IPLITERAL=y");
-#endif
-#ifdef ROUTER_IPLOOKUP
- read_macro_assignment("_HAVE_RTR_IPLOOKUP=y");
-#endif
-#ifdef ROUTER_MANUALROUTE
- read_macro_assignment("_HAVE_RTR_MANUALROUTE=y");
-#endif
-#ifdef ROUTER_QUERYPROGRAM
- read_macro_assignment("_HAVE_RTR_QUERYPROGRAM=y");
-#endif
-#ifdef ROUTER_REDIRECT
- read_macro_assignment("_HAVE_RTR_REDRCT=y");
+ read_macro_assignment(US"_HAVE_LKUP_WHOSON=y");
#endif
#ifdef TRANSPORT_APPENDFILE
- read_macro_assignment("_HAVE_TPT_APPENDFILE=y");
# ifdef SUPPORT_MAILDIR
- read_macro_assignment("_HAVE_TPT_APPEND_MAILDR=y");
+ read_macro_assignment(US"_HAVE_TPT_APPEND_MAILDR=y");
# endif
# ifdef SUPPORT_MAILSTORE
- read_macro_assignment("_HAVE_TPT_APPEND_MAILSTORE=y");
+ read_macro_assignment(US"_HAVE_TPT_APPEND_MAILSTORE=y");
# endif
# ifdef SUPPORT_MBX
- read_macro_assignment("_HAVE_TPT_APPEND_MBX=y");
+ read_macro_assignment(US"_HAVE_TPT_APPEND_MBX=y");
# endif
#endif
-#ifdef TRANSPORT_AUTOREPLY
- read_macro_assignment("_HAVE_TPT_AUTOREPLY=y");
-#endif
-#ifdef TRANSPORT_LMTP
- read_macro_assignment("_HAVE_TPT_LMTP=y");
-#endif
-#ifdef TRANSPORT_PIPE
- read_macro_assignment("_HAVE_TPT_PIPE=y");
-#endif
-#ifdef TRANSPORT_SMTP
- read_macro_assignment("_HAVE_TPT_SMTP=y");
-#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();
}
uschar *s, *filename;
const uschar *list = config_main_filelist;
-/* First create compile-time feature macros */
-readconf_features();
-
/* Loop through the possible file names */
while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
* 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
auths_init(void)
{
auth_instance *au, *bu;
+
readconf_driver_init(US"authenticator",
(driver_instance **)(&auths), /* chain anchor */
(driver_info *)auths_available, /* available drivers */
git://git.exim.org / exim.git / blobdiff