X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/cab0c27721a3c1f3a146e44bcc6462eefb9eb9e7..8f2cf8f5adaa08ef84b47bf9bc2f71e39236c22d:/src/src/drtables.c diff --git a/src/src/drtables.c b/src/src/drtables.c index c2419726e..a4958b179 100644 --- a/src/src/drtables.c +++ b/src/src/drtables.c @@ -2,7 +2,8 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2016 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ +/* Copyright (c) The Exim Maintainers 2020 - 2021 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -35,6 +36,10 @@ set to NULL for those that are not compiled into the binary. */ #include "auths/dovecot.h" #endif +#ifdef AUTH_EXTERNAL +#include "auths/external.h" +#endif + #ifdef AUTH_GSASL #include "auths/gsasl_exim.h" #endif @@ -61,117 +66,140 @@ auth_info auths_available[] = { #ifdef AUTH_CRAM_MD5 { - US"cram_md5", /* lookup name */ - auth_cram_md5_options, - &auth_cram_md5_options_count, - &auth_cram_md5_option_defaults, - sizeof(auth_cram_md5_options_block), - auth_cram_md5_init, /* init function */ - auth_cram_md5_server, /* server function */ - auth_cram_md5_client, /* client function */ - NULL /* diagnostic function */ + .driver_name = US"cram_md5", /* lookup name */ + .options = auth_cram_md5_options, + .options_count = &auth_cram_md5_options_count, + .options_block = &auth_cram_md5_option_defaults, + .options_len = sizeof(auth_cram_md5_options_block), + .init = auth_cram_md5_init, + .servercode = auth_cram_md5_server, + .clientcode = auth_cram_md5_client, + .version_report = NULL, + .macros_create = NULL, }, #endif #ifdef AUTH_CYRUS_SASL { - US"cyrus_sasl", /* lookup name */ - auth_cyrus_sasl_options, - &auth_cyrus_sasl_options_count, - &auth_cyrus_sasl_option_defaults, - sizeof(auth_cyrus_sasl_options_block), - auth_cyrus_sasl_init, /* init function */ - auth_cyrus_sasl_server, /* server function */ - NULL, /* client function */ - auth_cyrus_sasl_version_report /* diagnostic function */ + .driver_name = US"cyrus_sasl", + .options = auth_cyrus_sasl_options, + .options_count = &auth_cyrus_sasl_options_count, + .options_block = &auth_cyrus_sasl_option_defaults, + .options_len = sizeof(auth_cyrus_sasl_options_block), + .init = auth_cyrus_sasl_init, + .servercode = auth_cyrus_sasl_server, + .clientcode = NULL, + .version_report = auth_cyrus_sasl_version_report, + .macros_create = NULL, }, #endif #ifdef AUTH_DOVECOT { - US"dovecot", /* lookup name */ - auth_dovecot_options, - &auth_dovecot_options_count, - &auth_dovecot_option_defaults, - sizeof(auth_dovecot_options_block), - auth_dovecot_init, /* init function */ - auth_dovecot_server, /* server function */ - NULL, /* client function */ - NULL /* diagnostic function */ + .driver_name = US"dovecot", + .options = auth_dovecot_options, + .options_count = &auth_dovecot_options_count, + .options_block = &auth_dovecot_option_defaults, + .options_len = sizeof(auth_dovecot_options_block), + .init = auth_dovecot_init, + .servercode = auth_dovecot_server, + .clientcode = NULL, + .version_report = NULL, + .macros_create = NULL, + }, +#endif + +#ifdef AUTH_EXTERNAL + { + .driver_name = US"external", + .options = auth_external_options, + .options_count = &auth_external_options_count, + .options_block = &auth_external_option_defaults, + .options_len = sizeof(auth_external_options_block), + .init = auth_external_init, + .servercode = auth_external_server, + .clientcode = auth_external_client, + .version_report = NULL, + .macros_create = NULL, }, #endif #ifdef AUTH_GSASL { - US"gsasl", /* lookup name */ - auth_gsasl_options, - &auth_gsasl_options_count, - &auth_gsasl_option_defaults, - sizeof(auth_gsasl_options_block), - auth_gsasl_init, /* init function */ - auth_gsasl_server, /* server function */ - NULL, /* client function */ - auth_gsasl_version_report /* diagnostic function */ + .driver_name = US"gsasl", + .options = auth_gsasl_options, + .options_count = &auth_gsasl_options_count, + .options_block = &auth_gsasl_option_defaults, + .options_len = sizeof(auth_gsasl_options_block), + .init = auth_gsasl_init, + .servercode = auth_gsasl_server, + .clientcode = auth_gsasl_client, + .version_report = auth_gsasl_version_report, + .macros_create = auth_gsasl_macros, }, #endif #ifdef AUTH_HEIMDAL_GSSAPI { - US"heimdal_gssapi", /* lookup name */ - auth_heimdal_gssapi_options, - &auth_heimdal_gssapi_options_count, - &auth_heimdal_gssapi_option_defaults, - sizeof(auth_heimdal_gssapi_options_block), - auth_heimdal_gssapi_init, /* init function */ - auth_heimdal_gssapi_server, /* server function */ - NULL, /* client function */ - auth_heimdal_gssapi_version_report /* diagnostic function */ + .driver_name = US"heimdal_gssapi", + .options = auth_heimdal_gssapi_options, + .options_count = &auth_heimdal_gssapi_options_count, + .options_block = &auth_heimdal_gssapi_option_defaults, + .options_len = sizeof(auth_heimdal_gssapi_options_block), + .init = auth_heimdal_gssapi_init, + .servercode = auth_heimdal_gssapi_server, + .clientcode = NULL, + .version_report = auth_heimdal_gssapi_version_report, + .macros_create = NULL, }, #endif #ifdef AUTH_PLAINTEXT { - US"plaintext", /* lookup name */ - auth_plaintext_options, - &auth_plaintext_options_count, - &auth_plaintext_option_defaults, - sizeof(auth_plaintext_options_block), - auth_plaintext_init, /* init function */ - auth_plaintext_server, /* server function */ - auth_plaintext_client, /* client function */ - NULL /* diagnostic function */ + .driver_name = US"plaintext", + .options = auth_plaintext_options, + .options_count = &auth_plaintext_options_count, + .options_block = &auth_plaintext_option_defaults, + .options_len = sizeof(auth_plaintext_options_block), + .init = auth_plaintext_init, + .servercode = auth_plaintext_server, + .clientcode = auth_plaintext_client, + .version_report = NULL, + .macros_create = NULL, }, #endif #ifdef AUTH_SPA { - US"spa", /* lookup name */ - auth_spa_options, - &auth_spa_options_count, - &auth_spa_option_defaults, - sizeof(auth_spa_options_block), - auth_spa_init, /* init function */ - auth_spa_server, /* server function */ - auth_spa_client, /* client function */ - NULL /* diagnostic function */ + .driver_name = US"spa", + .options = auth_spa_options, + .options_count = &auth_spa_options_count, + .options_block = &auth_spa_option_defaults, + .options_len = sizeof(auth_spa_options_block), + .init = auth_spa_init, + .servercode = auth_spa_server, + .clientcode = auth_spa_client, + .version_report = NULL, + .macros_create = NULL, }, #endif #ifdef AUTH_TLS { - US"tls", /* lookup name */ - auth_tls_options, - &auth_tls_options_count, - &auth_tls_option_defaults, - sizeof(auth_tls_options_block), - auth_tls_init, /* init function */ - auth_tls_server, /* server function */ - NULL, /* client function */ - NULL /* diagnostic function */ + .driver_name = US"tls", + .options = auth_tls_options, + .options_count = &auth_tls_options_count, + .options_block = &auth_tls_option_defaults, + .options_len = sizeof(auth_tls_options_block), + .init = auth_tls_init, + .servercode = auth_tls_server, + .clientcode = NULL, + .version_report = NULL, + .macros_create = NULL, }, #endif -{ US"", NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL } + { .driver_name = US"" } /* end marker */ }; @@ -240,96 +268,96 @@ exim binary. */ router_info routers_available[] = { #ifdef ROUTER_ACCEPT { - US"accept", - accept_router_options, - &accept_router_options_count, - &accept_router_option_defaults, - sizeof(accept_router_options_block), - accept_router_init, - accept_router_entry, - NULL, /* no tidyup entry */ - ri_yestransport + .driver_name = US"accept", + .options = accept_router_options, + .options_count = &accept_router_options_count, + .options_block = &accept_router_option_defaults, + .options_len = sizeof(accept_router_options_block), + .init = accept_router_init, + .code = accept_router_entry, + .tidyup = NULL, /* no tidyup entry */ + .ri_flags = ri_yestransport }, #endif #ifdef ROUTER_DNSLOOKUP { - US"dnslookup", - dnslookup_router_options, - &dnslookup_router_options_count, - &dnslookup_router_option_defaults, - sizeof(dnslookup_router_options_block), - dnslookup_router_init, - dnslookup_router_entry, - NULL, /* no tidyup entry */ - ri_yestransport + .driver_name = US"dnslookup", + .options = dnslookup_router_options, + .options_count = &dnslookup_router_options_count, + .options_block = &dnslookup_router_option_defaults, + .options_len = sizeof(dnslookup_router_options_block), + .init = dnslookup_router_init, + .code = dnslookup_router_entry, + .tidyup = NULL, /* no tidyup entry */ + .ri_flags = ri_yestransport }, #endif #ifdef ROUTER_IPLITERAL { - US"ipliteral", - ipliteral_router_options, - &ipliteral_router_options_count, - &ipliteral_router_option_defaults, - sizeof(ipliteral_router_options_block), - ipliteral_router_init, - ipliteral_router_entry, - NULL, /* no tidyup entry */ - ri_yestransport + .driver_name = US"ipliteral", + .options = ipliteral_router_options, + .options_count = &ipliteral_router_options_count, + .options_block = &ipliteral_router_option_defaults, + .options_len = sizeof(ipliteral_router_options_block), + .init = ipliteral_router_init, + .code = ipliteral_router_entry, + .tidyup = NULL, /* no tidyup entry */ + .ri_flags = ri_yestransport }, #endif #ifdef ROUTER_IPLOOKUP { - US"iplookup", - iplookup_router_options, - &iplookup_router_options_count, - &iplookup_router_option_defaults, - sizeof(iplookup_router_options_block), - iplookup_router_init, - iplookup_router_entry, - NULL, /* no tidyup entry */ - ri_notransport + .driver_name = US"iplookup", + .options = iplookup_router_options, + .options_count = &iplookup_router_options_count, + .options_block = &iplookup_router_option_defaults, + .options_len = sizeof(iplookup_router_options_block), + .init = iplookup_router_init, + .code = iplookup_router_entry, + .tidyup = NULL, /* no tidyup entry */ + .ri_flags = ri_notransport }, #endif #ifdef ROUTER_MANUALROUTE { - US"manualroute", - manualroute_router_options, - &manualroute_router_options_count, - &manualroute_router_option_defaults, - sizeof(manualroute_router_options_block), - manualroute_router_init, - manualroute_router_entry, - NULL, /* no tidyup entry */ - 0 + .driver_name = US"manualroute", + .options = manualroute_router_options, + .options_count = &manualroute_router_options_count, + .options_block = &manualroute_router_option_defaults, + .options_len = sizeof(manualroute_router_options_block), + .init = manualroute_router_init, + .code = manualroute_router_entry, + .tidyup = NULL, /* no tidyup entry */ + .ri_flags = 0 }, #endif #ifdef ROUTER_QUERYPROGRAM { - US"queryprogram", - queryprogram_router_options, - &queryprogram_router_options_count, - &queryprogram_router_option_defaults, - sizeof(queryprogram_router_options_block), - queryprogram_router_init, - queryprogram_router_entry, - NULL, /* no tidyup entry */ - 0 + .driver_name = US"queryprogram", + .options = queryprogram_router_options, + .options_count = &queryprogram_router_options_count, + .options_block = &queryprogram_router_option_defaults, + .options_len = sizeof(queryprogram_router_options_block), + .init = queryprogram_router_init, + .code = queryprogram_router_entry, + .tidyup = NULL, /* no tidyup entry */ + .ri_flags = 0 }, #endif #ifdef ROUTER_REDIRECT { - US"redirect", - redirect_router_options, - &redirect_router_options_count, - &redirect_router_option_defaults, - sizeof(redirect_router_options_block), - redirect_router_init, - redirect_router_entry, - NULL, /* no tidyup entry */ - ri_notransport + .driver_name = US"redirect", + .options = redirect_router_options, + .options_count = &redirect_router_options_count, + .options_block = &redirect_router_option_defaults, + .options_len = sizeof(redirect_router_options_block), + .init = redirect_router_init, + .code = redirect_router_entry, + .tidyup = NULL, /* no tidyup entry */ + .ri_flags = ri_notransport }, #endif -{ US"", NULL, NULL, NULL, 0, NULL, NULL, NULL, 0 } + { US"" } }; @@ -337,94 +365,147 @@ router_info routers_available[] = { transport_info transports_available[] = { #ifdef TRANSPORT_APPENDFILE { - US"appendfile", /* driver name */ - appendfile_transport_options, /* local options table */ - &appendfile_transport_options_count, /* number of entries */ - &appendfile_transport_option_defaults, /* private options defaults */ - sizeof(appendfile_transport_options_block), /* size of private block */ - appendfile_transport_init, /* init entry point */ - appendfile_transport_entry, /* main entry point */ - NULL, /* no tidyup entry */ - NULL, /* no closedown entry */ - TRUE, /* local flag */ + .driver_name = US"appendfile", + .options = appendfile_transport_options, + .options_count = &appendfile_transport_options_count, + .options_block = &appendfile_transport_option_defaults, /* private options defaults */ + .options_len = sizeof(appendfile_transport_options_block), + .init = appendfile_transport_init, + .code = appendfile_transport_entry, + .tidyup = NULL, + .closedown = NULL, + .local = TRUE }, #endif #ifdef TRANSPORT_AUTOREPLY { - US"autoreply", /* driver name */ - autoreply_transport_options, /* local options table */ - &autoreply_transport_options_count, /* number of entries */ - &autoreply_transport_option_defaults, /* private options defaults */ - sizeof(autoreply_transport_options_block), /* size of private block */ - autoreply_transport_init, /* init entry point */ - autoreply_transport_entry, /* main entry point */ - NULL, /* no tidyup entry */ - NULL, /* no closedown entry */ - TRUE /* local flag */ + .driver_name = US"autoreply", + .options = autoreply_transport_options, + .options_count = &autoreply_transport_options_count, + .options_block = &autoreply_transport_option_defaults, + .options_len = sizeof(autoreply_transport_options_block), + .init = autoreply_transport_init, + .code = autoreply_transport_entry, + .tidyup = NULL, + .closedown = NULL, + .local = TRUE }, #endif #ifdef TRANSPORT_LMTP { - US"lmtp", /* driver name */ - lmtp_transport_options, /* local options table */ - &lmtp_transport_options_count, /* number of entries */ - &lmtp_transport_option_defaults, /* private options defaults */ - sizeof(lmtp_transport_options_block), /* size of private block */ - lmtp_transport_init, /* init entry point */ - lmtp_transport_entry, /* main entry point */ - NULL, /* no tidyup entry */ - NULL, /* no closedown entry */ - TRUE /* local flag */ + .driver_name = US"lmtp", + .options = lmtp_transport_options, + .options_count = &lmtp_transport_options_count, + .options_block = &lmtp_transport_option_defaults, + .options_len = sizeof(lmtp_transport_options_block), + .init = lmtp_transport_init, + .code = lmtp_transport_entry, + .tidyup = NULL, + .closedown = NULL, + .local = TRUE }, #endif #ifdef TRANSPORT_PIPE { - US"pipe", /* driver name */ - pipe_transport_options, /* local options table */ - &pipe_transport_options_count, /* number of entries */ - &pipe_transport_option_defaults, /* private options defaults */ - sizeof(pipe_transport_options_block), /* size of private block */ - pipe_transport_init, /* init entry point */ - pipe_transport_entry, /* main entry point */ - NULL, /* no tidyup entry */ - NULL, /* no closedown entry */ - TRUE /* local flag */ + .driver_name = US"pipe", + .options = pipe_transport_options, + .options_count = &pipe_transport_options_count, + .options_block = &pipe_transport_option_defaults, + .options_len = sizeof(pipe_transport_options_block), + .init = pipe_transport_init, + .code = pipe_transport_entry, + .tidyup = NULL, + .closedown = NULL, + .local = TRUE }, #endif #ifdef EXPERIMENTAL_QUEUEFILE { - US"queuefile", /* driver name */ - queuefile_transport_options, /* local options table */ - &queuefile_transport_options_count, /* number of entries */ - &queuefile_transport_option_defaults, /* private options defaults */ - sizeof(queuefile_transport_options_block), /* size of private block */ - queuefile_transport_init, /* init entry point */ - queuefile_transport_entry, /* main entry point */ - NULL, /* no tidyup entry */ - NULL, /* no closedown entry */ - TRUE /* local flag */ + .driver_name = US"queuefile", + .options = queuefile_transport_options, + .options_count = &queuefile_transport_options_count, + .options_block = &queuefile_transport_option_defaults, + .options_len = sizeof(queuefile_transport_options_block), + .init = queuefile_transport_init, + .code = queuefile_transport_entry, + .tidyup = NULL, + .closedown = NULL, + .local = TRUE }, #endif #ifdef TRANSPORT_SMTP { - US"smtp", /* driver name */ - smtp_transport_options, /* local options table */ - &smtp_transport_options_count, /* number of entries */ - &smtp_transport_option_defaults, /* private options defaults */ - sizeof(smtp_transport_options_block), /* size of private block */ - smtp_transport_init, /* init entry point */ - smtp_transport_entry, /* main entry point */ - NULL, /* no tidyup entry */ - smtp_transport_closedown, /* close down passed channel */ - FALSE /* local flag */ + .driver_name = US"smtp", + .options = smtp_transport_options, + .options_count = &smtp_transport_options_count, + .options_block = &smtp_transport_option_defaults, + .options_len = sizeof(smtp_transport_options_block), + .init = smtp_transport_init, + .code = smtp_transport_entry, + .tidyup = NULL, + .closedown = smtp_transport_closedown, + .local = FALSE }, #endif -{ US"", NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, FALSE } + { US"" } }; - #ifndef MACRO_PREDEF +gstring * +auth_show_supported(gstring * g) +{ +g = string_cat(g, US"Authenticators:"); +for (auth_info * ai = auths_available; ai->driver_name[0]; ai++) + g = string_fmt_append(g, " %s", ai->driver_name); +return string_cat(g, US"\n"); +} + +gstring * +route_show_supported(gstring * g) +{ +g = string_cat(g, US"Routers:"); +for (router_info * rr = routers_available; rr->driver_name[0]; rr++) + g = string_fmt_append(g, " %s", rr->driver_name); +return string_cat(g, US"\n"); +} + +gstring * +transport_show_supported(gstring * g) +{ +g = string_cat(g, US"Transports:"); +#ifdef TRANSPORT_APPENDFILE + g = string_cat(g, US" appendfile"); + #ifdef SUPPORT_MAILDIR + g = string_cat(g, US"/maildir"); /* damn these subclasses */ + #endif + #ifdef SUPPORT_MAILSTORE + g = string_cat(g, US"/mailstore"); + #endif + #ifdef SUPPORT_MBX + g = string_cat(g, US"/mbx"); + #endif +#endif +#ifdef TRANSPORT_AUTOREPLY + g = string_cat(g, US" autoreply"); +#endif +#ifdef TRANSPORT_LMTP + g = string_cat(g, US" lmtp"); +#endif +#ifdef TRANSPORT_PIPE + g = string_cat(g, US" pipe"); +#endif +#ifdef EXPERIMENTAL_QUEUEFILE + g = string_cat(g, US" queuefile"); +#endif +#ifdef TRANSPORT_SMTP + g = string_cat(g, US" smtp"); +#endif +return string_cat(g, US"\n"); +} + + + struct lookupmodulestr { void *dl; @@ -437,7 +518,7 @@ static struct lookupmodulestr *lookupmodules = NULL; static void addlookupmodule(void *dl, struct lookup_module_info *info) { -struct lookupmodulestr *p = store_malloc(sizeof(struct lookupmodulestr)); +struct lookupmodulestr *p = store_get(sizeof(struct lookupmodulestr), FALSE); p->dl = dl; p->info = info; @@ -465,8 +546,7 @@ if (lookup_list[pos]) /* need to insert it, so move all the other items up (last slot is still empty, of course) */ - memmove(&lookup_list[pos+1], - &lookup_list[pos], + memmove(&lookup_list[pos+1], &lookup_list[pos], sizeof(lookup_info *) * (lookup_list_count-pos-1)); } lookup_list[pos] = info; @@ -492,6 +572,9 @@ extern lookup_module_info dsearch_lookup_module_info; #if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2 extern lookup_module_info ibase_lookup_module_info; #endif +#if defined(LOOKUP_JSON) +extern lookup_module_info json_lookup_module_info; +#endif #if defined(LOOKUP_LDAP) extern lookup_module_info ldap_lookup_module_info; #endif @@ -519,10 +602,10 @@ extern lookup_module_info pgsql_lookup_module_info; #if defined(LOOKUP_REDIS) && LOOKUP_REDIS!=2 extern lookup_module_info redis_lookup_module_info; #endif -#if defined(EXPERIMENTAL_LMDB) +#if defined(LOOKUP_LMDB) extern lookup_module_info lmdb_lookup_module_info; #endif -#if defined(EXPERIMENTAL_SPF) +#if defined(SUPPORT_SPF) extern lookup_module_info spf_lookup_module_info; #endif #if defined(LOOKUP_SQLITE) && LOOKUP_SQLITE!=2 @@ -535,193 +618,200 @@ extern lookup_module_info testdb_lookup_module_info; extern lookup_module_info whoson_lookup_module_info; #endif +extern lookup_module_info readsock_lookup_module_info; + void init_lookup_list(void) { #ifdef LOOKUP_MODULE_DIR - DIR *dd; - struct dirent *ent; - int countmodules = 0; - int moduleerrors = 0; +DIR *dd; +struct dirent *ent; +int countmodules = 0; +int moduleerrors = 0; #endif - struct lookupmodulestr *p; - static BOOL lookup_list_init_done = FALSE; - +static BOOL lookup_list_init_done = FALSE; +rmark reset_point; - if (lookup_list_init_done) - return; - lookup_list_init_done = TRUE; +if (lookup_list_init_done) + return; +reset_point = store_mark(); +lookup_list_init_done = TRUE; #if defined(LOOKUP_CDB) && LOOKUP_CDB!=2 - addlookupmodule(NULL, &cdb_lookup_module_info); +addlookupmodule(NULL, &cdb_lookup_module_info); #endif #if defined(LOOKUP_DBM) && LOOKUP_DBM!=2 - addlookupmodule(NULL, &dbmdb_lookup_module_info); +addlookupmodule(NULL, &dbmdb_lookup_module_info); #endif #if defined(LOOKUP_DNSDB) && LOOKUP_DNSDB!=2 - addlookupmodule(NULL, &dnsdb_lookup_module_info); +addlookupmodule(NULL, &dnsdb_lookup_module_info); #endif #if defined(LOOKUP_DSEARCH) && LOOKUP_DSEARCH!=2 - addlookupmodule(NULL, &dsearch_lookup_module_info); +addlookupmodule(NULL, &dsearch_lookup_module_info); #endif #if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2 - addlookupmodule(NULL, &ibase_lookup_module_info); +addlookupmodule(NULL, &ibase_lookup_module_info); #endif #ifdef LOOKUP_LDAP - addlookupmodule(NULL, &ldap_lookup_module_info); +addlookupmodule(NULL, &ldap_lookup_module_info); +#endif + +#ifdef LOOKUP_JSON +addlookupmodule(NULL, &json_lookup_module_info); #endif #if defined(LOOKUP_LSEARCH) && LOOKUP_LSEARCH!=2 - addlookupmodule(NULL, &lsearch_lookup_module_info); +addlookupmodule(NULL, &lsearch_lookup_module_info); #endif #if defined(LOOKUP_MYSQL) && LOOKUP_MYSQL!=2 - addlookupmodule(NULL, &mysql_lookup_module_info); +addlookupmodule(NULL, &mysql_lookup_module_info); #endif #if defined(LOOKUP_NIS) && LOOKUP_NIS!=2 - addlookupmodule(NULL, &nis_lookup_module_info); +addlookupmodule(NULL, &nis_lookup_module_info); #endif #if defined(LOOKUP_NISPLUS) && LOOKUP_NISPLUS!=2 - addlookupmodule(NULL, &nisplus_lookup_module_info); +addlookupmodule(NULL, &nisplus_lookup_module_info); #endif #if defined(LOOKUP_ORACLE) && LOOKUP_ORACLE!=2 - addlookupmodule(NULL, &oracle_lookup_module_info); +addlookupmodule(NULL, &oracle_lookup_module_info); #endif #if defined(LOOKUP_PASSWD) && LOOKUP_PASSWD!=2 - addlookupmodule(NULL, &passwd_lookup_module_info); +addlookupmodule(NULL, &passwd_lookup_module_info); #endif #if defined(LOOKUP_PGSQL) && LOOKUP_PGSQL!=2 - addlookupmodule(NULL, &pgsql_lookup_module_info); +addlookupmodule(NULL, &pgsql_lookup_module_info); #endif #if defined(LOOKUP_REDIS) && LOOKUP_REDIS!=2 - addlookupmodule(NULL, &redis_lookup_module_info); +addlookupmodule(NULL, &redis_lookup_module_info); #endif -#ifdef EXPERIMENTAL_LMDB - addlookupmodule(NULL, &lmdb_lookup_module_info); +#ifdef LOOKUP_LMDB +addlookupmodule(NULL, &lmdb_lookup_module_info); #endif -#ifdef EXPERIMENTAL_SPF - addlookupmodule(NULL, &spf_lookup_module_info); +#ifdef SUPPORT_SPF +addlookupmodule(NULL, &spf_lookup_module_info); #endif #if defined(LOOKUP_SQLITE) && LOOKUP_SQLITE!=2 - addlookupmodule(NULL, &sqlite_lookup_module_info); +addlookupmodule(NULL, &sqlite_lookup_module_info); #endif #if defined(LOOKUP_TESTDB) && LOOKUP_TESTDB!=2 - addlookupmodule(NULL, &testdb_lookup_module_info); +addlookupmodule(NULL, &testdb_lookup_module_info); #endif #if defined(LOOKUP_WHOSON) && LOOKUP_WHOSON!=2 - addlookupmodule(NULL, &whoson_lookup_module_info); +addlookupmodule(NULL, &whoson_lookup_module_info); #endif +addlookupmodule(NULL, &readsock_lookup_module_info); + #ifdef LOOKUP_MODULE_DIR - dd = opendir(LOOKUP_MODULE_DIR); - if (dd == NULL) { - DEBUG(D_lookup) debug_printf("Couldn't open %s: not loading lookup modules\n", LOOKUP_MODULE_DIR); - log_write(0, LOG_MAIN, "Couldn't open %s: not loading lookup modules\n", LOOKUP_MODULE_DIR); +if (!(dd = exim_opendir(LOOKUP_MODULE_DIR))) + { + DEBUG(D_lookup) debug_printf("Couldn't open %s: not loading lookup modules\n", LOOKUP_MODULE_DIR); + log_write(0, LOG_MAIN, "Couldn't open %s: not loading lookup modules\n", LOOKUP_MODULE_DIR); } - else { - const pcre *regex_islookupmod = regex_must_compile( - US"\\." DYNLIB_FN_EXT "$", FALSE, TRUE); - - DEBUG(D_lookup) debug_printf("Loading lookup modules from %s\n", LOOKUP_MODULE_DIR); - while ((ent = readdir(dd)) != NULL) { - char *name = ent->d_name; - int len = (int)strlen(name); - if (pcre_exec(regex_islookupmod, NULL, name, len, 0, PCRE_EOPT, NULL, 0) >= 0) { - int pathnamelen = len + (int)strlen(LOOKUP_MODULE_DIR) + 2; - void *dl; - struct lookup_module_info *info; - const char *errormsg; - - /* SRH: am I being paranoid here or what? */ - if (pathnamelen > big_buffer_size) { - fprintf(stderr, "Loading lookup modules: %s/%s: name too long\n", LOOKUP_MODULE_DIR, name); - log_write(0, LOG_MAIN|LOG_PANIC, "%s/%s: name too long\n", LOOKUP_MODULE_DIR, name); - continue; - } - - /* SRH: snprintf here? */ - sprintf(CS big_buffer, "%s/%s", LOOKUP_MODULE_DIR, name); - - dl = dlopen(CS big_buffer, RTLD_NOW);// TJ was LAZY - if (dl == NULL) { - fprintf(stderr, "Error loading %s: %s\n", name, dlerror()); - moduleerrors++; - log_write(0, LOG_MAIN|LOG_PANIC, "Error loading lookup module %s: %s\n", name, dlerror()); - continue; - } - - /* FreeBSD nsdispatch() can trigger dlerror() errors about - * _nss_cache_cycle_prevention_function; we need to clear the dlerror() - * state before calling dlsym(), so that any error afterwards only - * comes from dlsym(). - */ - errormsg = dlerror(); - - info = (struct lookup_module_info*) dlsym(dl, "_lookup_module_info"); - if ((errormsg = dlerror()) != NULL) { - fprintf(stderr, "%s does not appear to be a lookup module (%s)\n", name, errormsg); - dlclose(dl); - moduleerrors++; - log_write(0, LOG_MAIN|LOG_PANIC, "%s does not appear to be a lookup module (%s)\n", name, errormsg); - continue; - } - if (info->magic != LOOKUP_MODULE_INFO_MAGIC) { - fprintf(stderr, "Lookup module %s is not compatible with this version of Exim\n", name); - dlclose(dl); - moduleerrors++; - log_write(0, LOG_MAIN|LOG_PANIC, "Lookup module %s is not compatible with this version of Exim\n", name); - continue; - } - - addlookupmodule(dl, info); - DEBUG(D_lookup) debug_printf("Loaded \"%s\" (%d lookup types)\n", name, info->lookupcount); - countmodules++; +else + { + const pcre2_code *regex_islookupmod = regex_must_compile( + US"\\." DYNLIB_FN_EXT "$", FALSE, TRUE); + + DEBUG(D_lookup) debug_printf("Loading lookup modules from %s\n", LOOKUP_MODULE_DIR); + while ((ent = readdir(dd))) + { + char * name = ent->d_name; + int len = (int)strlen(name); + if (regex_match(regex_islookupmod, US name, len, NUL)) + { + int pathnamelen = len + (int)strlen(LOOKUP_MODULE_DIR) + 2; + void *dl; + struct lookup_module_info *info; + const char *errormsg; + + /* SRH: am I being paranoid here or what? */ + if (pathnamelen > big_buffer_size) + { + fprintf(stderr, "Loading lookup modules: %s/%s: name too long\n", LOOKUP_MODULE_DIR, name); + log_write(0, LOG_MAIN|LOG_PANIC, "%s/%s: name too long\n", LOOKUP_MODULE_DIR, name); + continue; + } + + /* SRH: snprintf here? */ + sprintf(CS big_buffer, "%s/%s", LOOKUP_MODULE_DIR, name); + + if (!(dl = dlopen(CS big_buffer, RTLD_NOW))) + { + errormsg = dlerror(); + fprintf(stderr, "Error loading %s: %s\n", name, errormsg); + log_write(0, LOG_MAIN|LOG_PANIC, "Error loading lookup module %s: %s\n", name, errormsg); + moduleerrors++; + continue; + } + + /* FreeBSD nsdispatch() can trigger dlerror() errors about + _nss_cache_cycle_prevention_function; we need to clear the dlerror() + state before calling dlsym(), so that any error afterwards only comes + from dlsym(). */ + + errormsg = dlerror(); + + info = (struct lookup_module_info*) dlsym(dl, "_lookup_module_info"); + if ((errormsg = dlerror())) + { + fprintf(stderr, "%s does not appear to be a lookup module (%s)\n", name, errormsg); + log_write(0, LOG_MAIN|LOG_PANIC, "%s does not appear to be a lookup module (%s)\n", name, errormsg); + dlclose(dl); + moduleerrors++; + continue; + } + if (info->magic != LOOKUP_MODULE_INFO_MAGIC) + { + fprintf(stderr, "Lookup module %s is not compatible with this version of Exim\n", name); + log_write(0, LOG_MAIN|LOG_PANIC, "Lookup module %s is not compatible with this version of Exim\n", name); + dlclose(dl); + moduleerrors++; + continue; + } + + addlookupmodule(dl, info); + DEBUG(D_lookup) debug_printf("Loaded \"%s\" (%d lookup types)\n", name, info->lookupcount); + countmodules++; } } - store_free((void*)regex_islookupmod); - closedir(dd); + store_free((void*)regex_islookupmod); + closedir(dd); } - DEBUG(D_lookup) debug_printf("Loaded %d lookup modules\n", countmodules); +DEBUG(D_lookup) debug_printf("Loaded %d lookup modules\n", countmodules); #endif - DEBUG(D_lookup) debug_printf("Total %d lookups\n", lookup_list_count); - - lookup_list = store_malloc(sizeof(lookup_info *) * lookup_list_count); - memset(lookup_list, 0, sizeof(lookup_info *) * lookup_list_count); +DEBUG(D_lookup) debug_printf("Total %d lookups\n", lookup_list_count); - /* now add all lookups to the real list */ - p = lookupmodules; - while (p) { - int j; - struct lookupmodulestr *pnext; +lookup_list = store_malloc(sizeof(lookup_info *) * lookup_list_count); +memset(lookup_list, 0, sizeof(lookup_info *) * lookup_list_count); - for (j = 0; j < p->info->lookupcount; j++) - add_lookup_to_list(p->info->lookups[j]); - - pnext = p->next; - store_free(p); - p = pnext; - } - /* just to be sure */ - lookupmodules = NULL; +/* now add all lookups to the real list */ +for (struct lookupmodulestr * p = lookupmodules; p; p = p->next) + for (int j = 0; j < p->info->lookupcount; j++) + add_lookup_to_list(p->info->lookups[j]); +store_reset(reset_point); +/* just to be sure */ +lookupmodules = NULL; } #endif /*!MACRO_PREDEF*/