X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/863bd541063e72fcea7305b9d3ee2cb460a6d3d1..32b8ce41b3fe2ea10f3343a6c9e0acfccea40dd6:/src/src/readconf.c

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 5efe7aa04..340a0c0eb 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -226,6 +226,7 @@ static optionlist optionlist_config[] = {
   { "dccifd_address",           opt_stringptr,   &dccifd_address },
   { "dccifd_options",           opt_stringptr,   &dccifd_options },
 #endif
+  { "debug_store",              opt_bool,        &debug_store },
   { "delay_warning",            opt_timelist,    &delay_warning },
   { "delay_warning_condition",  opt_stringptr,   &delay_warning_condition },
   { "deliver_drop_privilege",   opt_bool,        &deliver_drop_privilege },
@@ -1025,6 +1026,7 @@ for (;;)
       if (c = p[1], c == 'O' || c == 'D' || c == 'H')
 	{
 /* fprintf(stderr, "%s: builtins create triggered by '%s'\n", __FUNCTION__, s); */
+	builtin_macros_create_trigger = string_copy(s);
 	macros_create_builtin();
 	break;
 	}
@@ -3783,14 +3785,14 @@ if (tls_dh_max_bits < 1024)
       "tls_dh_max_bits is too small, must be at least 1024 for interop");
 
 /* If openssl_options is set, validate it */
-if (openssl_options != NULL)
+if (openssl_options)
   {
 # ifdef USE_GNUTLS
   log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
     "openssl_options is set but we're using GnuTLS");
 # else
   long dummy;
-  if (!(tls_openssl_options_parse(openssl_options, &dummy)))
+  if (!tls_openssl_options_parse(openssl_options, &dummy))
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
       "openssl_options parse error: %s", openssl_options);
 # endif