X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fdrtables.c;h=cd12dd1da8dc8350463e7a0741966b678b9ec1ec;hb=db3f7b6972f3b003c0413b78afcfbe295ffe0b97;hp=1d81557983dd7dc5d8ff4769b0792f85e3a532cb;hpb=c5db348c5e29e93e51389fa0079f829967c5da82;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/drtables.c b/src/src/drtables.c index 1d8155798..cd12dd1da 100644 --- a/src/src/drtables.c +++ b/src/src/drtables.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2017 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -119,7 +119,7 @@ auth_info auths_available[] = { { .driver_name = US"heimdal_gssapi", .options = auth_heimdal_gssapi_options, - .options_count &auth_heimdal_gssapi_options_count, + .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, @@ -171,9 +171,18 @@ auth_info auths_available[] = { }, #endif -{ .driver_name = US"" } /* end marker */ + { .driver_name = US"" } /* end marker */ }; +void +auth_show_supported(FILE * f) +{ +fprintf(f, "Authenticators:"); +for (auth_info * ai = auths_available; ai->driver_name[0]; ai++) + fprintf(f, " %s", ai->driver_name); +fprintf(f, "\n"); +} + /* Tables of information about which routers and transports are included in the exim binary. */ @@ -329,10 +338,21 @@ router_info routers_available[] = { .ri_flags = ri_notransport }, #endif -{ US"" } + { US"" } }; +void +route_show_supported(FILE * f) +{ +fprintf(f, "Routers:"); +for (router_info * rr = routers_available; rr->driver_name[0]; rr++) + fprintf(f, " %s", rr->driver_name); +fprintf(f, "\n"); +} + + + transport_info transports_available[] = { #ifdef TRANSPORT_APPENDFILE @@ -419,9 +439,43 @@ transport_info transports_available[] = { .local = FALSE }, #endif -{ US"" } + { US"" } }; +void +transport_show_supported(FILE * f) +{ +fprintf(f, "Transports:"); +#ifdef TRANSPORT_APPENDFILE + fprintf(f, " appendfile"); + #ifdef SUPPORT_MAILDIR + fprintf(f, "/maildir"); /* damn these subclasses */ + #endif + #ifdef SUPPORT_MAILSTORE + fprintf(f, "/mailstore"); + #endif + #ifdef SUPPORT_MBX + fprintf(f, "/mbx"); + #endif +#endif +#ifdef TRANSPORT_AUTOREPLY + fprintf(f, " autoreply"); +#endif +#ifdef TRANSPORT_LMTP + fprintf(f, " lmtp"); +#endif +#ifdef TRANSPORT_PIPE + fprintf(f, " pipe"); +#endif +#ifdef EXPERIMENTAL_QUEUEFILE + fprintf(f, " queuefile"); +#endif +#ifdef TRANSPORT_SMTP + fprintf(f, " smtp"); +#endif +fprintf(f, "\n"); +} + #ifndef MACRO_PREDEF @@ -522,7 +576,7 @@ extern lookup_module_info redis_lookup_module_info; #if defined(EXPERIMENTAL_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 @@ -613,7 +667,7 @@ init_lookup_list(void) addlookupmodule(NULL, &lmdb_lookup_module_info); #endif -#ifdef EXPERIMENTAL_SPF +#ifdef SUPPORT_SPF addlookupmodule(NULL, &spf_lookup_module_info); #endif @@ -710,10 +764,9 @@ init_lookup_list(void) /* now add all lookups to the real list */ p = lookupmodules; while (p) { - int j; struct lookupmodulestr *pnext; - for (j = 0; j < p->info->lookupcount; j++) + for (int j = 0; j < p->info->lookupcount; j++) add_lookup_to_list(p->info->lookups[j]); pnext = p->next;