X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Freadconf.c;h=05d3077e017d690d1b0fd74fc5e622d558171222;hb=a643c7712f2684e7ec1ac77183a0bfbd59bfd5ca;hp=f55c1da3479c8bfed64c264e0a5e5f7d47954c86;hpb=00f1386065b4ab2aed12facd883ebd324c8c66d5;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/readconf.c b/src/src/readconf.c index f55c1da34..05d3077e0 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -117,6 +117,9 @@ static optionlist optionlist_config[] = { #endif { "disable_ipv6", opt_bool, &disable_ipv6 }, #ifndef DISABLE_DKIM + { "dkim_verify_hashes", opt_stringptr, &dkim_verify_hashes }, + { "dkim_verify_keytypes", opt_stringptr, &dkim_verify_keytypes }, + { "dkim_verify_minimal", opt_bool, &dkim_verify_minimal }, { "dkim_verify_signers", opt_stringptr, &dkim_verify_signers }, #endif #ifdef EXPERIMENTAL_DMARC @@ -306,7 +309,7 @@ static optionlist optionlist_config[] = { { "smtp_ratelimit_hosts", opt_stringptr, &smtp_ratelimit_hosts }, { "smtp_ratelimit_mail", opt_stringptr, &smtp_ratelimit_mail }, { "smtp_ratelimit_rcpt", opt_stringptr, &smtp_ratelimit_rcpt }, - { "smtp_receive_timeout", opt_func, &fn_smtp_receive_timeout }, + { "smtp_receive_timeout", opt_func, (void *) &fn_smtp_receive_timeout }, { "smtp_reserve_hosts", opt_stringptr, &smtp_reserve_hosts }, { "smtp_return_error_details",opt_bool, &smtp_return_error_details }, #ifdef SUPPORT_I18N @@ -3350,7 +3353,7 @@ syscalls). It also assume we're on the relevant pool. */ if (statbuf.st_size > 8192) { rmark r = store_mark(); - store_get((int)statbuf.st_size, FALSE); + void * dummy = store_get((int)statbuf.st_size, FALSE); store_reset(r); }