X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fexim.c;h=8e700f7114d151b20003782f75581c10d4e86c1a;hb=c05bdbd6fcc573e071652f88b468091f57a0430d;hp=5c9d4ee16a478791ae59968cb097c6aa76231fb0;hpb=db3f7b6972f3b003c0413b78afcfbe295ffe0b97;p=exim.git diff --git a/src/src/exim.c b/src/src/exim.c index 5c9d4ee16..8e700f711 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -930,6 +930,9 @@ fprintf(fp, "Lookups (built-in):"); #if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2 fprintf(fp, " ibase"); #endif +#if defined(LOOKUP_JSON) && LOOKUP_JSON!=2 + fprintf(fp, " json"); +#endif #if defined(LOOKUP_LDAP) && LOOKUP_LDAP!=2 fprintf(fp, " ldap ldapdn ldapm"); #endif @@ -2683,7 +2686,7 @@ for (i = 1; i < argc; i++) #ifdef SUPPORT_TLS /* -MCt: similar to -MCT below but the connection is still open - via a proxy proces which handles the TLS context and coding. + via a proxy process which handles the TLS context and coding. Require three arguments for the proxied local address and port, and the TLS cipher. */ @@ -3635,7 +3638,7 @@ if (f.running_in_test_harness) smtputf8_advertise_hosts = NULL; is a failure. It leaves the configuration file open so that the subsequent configuration data for delivery can be read if needed. -NOTE: immediatly after opening the configuration file we change the working +NOTE: immediately after opening the configuration file we change the working directory to "/"! Later we change to $spool_directory. We do it there, because during readconf_main() some expansion takes place already. */