From: Jeremy Harris Date: Tue, 19 Dec 2017 22:14:18 +0000 (+0000) Subject: Merge branch '4.next' X-Git-Tag: exim-4_91_RC1~148 X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/d4fd1b83a197d73cbac114fe53f3448d8b5c7cc2?hp=b4ad78623875988d016ff816dc6c9c382be897f9 Merge branch '4.next' --- diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 9c011a989..7440a4c06 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -45,7 +45,7 @@ . Update the Copyright year (only) when changing content. . ///////////////////////////////////////////////////////////////////////////// -.set previousversion "4.89" +.set previousversion "4.90" .include ./local_params .set ACL "access control lists (ACLs)" @@ -2791,12 +2791,10 @@ files or databases you are using, you must exit and restart Exim before trying the same lookup again. Otherwise, because each Exim process caches the results of lookups, you will just get the same result as before. -.new Macro processing is done on lines before string-expansion: new macros can be defined and macros will be expanded. Because macros in the config file are often used for secrets, those are only available to admin users. -.wen .vitem &%-bem%&&~<&'filename'&> .oindex "&%-bem%&" @@ -3867,14 +3865,12 @@ This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option, and passes on the fact that the host to which Exim is connected supports TLS encryption. -.new .vitem &%-MCt%&&~<&'IP&~address'&>&~<&'port'&>&~<&'cipher'&> .oindex "&%-MCt%&" This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option, and passes on the fact that the connection is being proxied by a parent process for handling TLS encryption. The arguments give the local address and port being proxied, and the TLS cipher. -.wen .vitem &%-Mc%&&~<&'message&~id'&>&~<&'message&~id'&>&~... .oindex "&%-Mc%&" @@ -11050,12 +11046,10 @@ colon-separated components are permitted, each containing from one to four hexadecimal digits. There may be fewer than eight components if an empty component (adjacent colons) is present. Only one empty component is permitted. -.new &*Note*&: The checks used to be just on the form of the address; actual numerical values were not considered. Thus, for example, 999.999.999.999 passed the IPv4 check. This is no longer the case. -.wen The main use of these tests is to distinguish between IP addresses and host names, or between IPv4 and IPv6 addresses. For example, you could use @@ -12089,9 +12083,7 @@ when the ACL &%malware%& condition is true (see section &<>&). This variable contains the number of bytes in the longest line that was received as part of the message, not counting the line termination character(s). -.new It is not valid if the &%spool_files_wireformat%& option is used. -.wen .vitem &$message_age$& .cindex "message" "age of" @@ -12134,11 +12126,9 @@ in bytes. The count starts from the character after the blank line that separates the body from the header. Newlines are included in the count. See also &$message_size$&, &$body_linecount$&, and &$body_zerocount$&. -.new If the spool file is wireformat (see the &%spool_files_wireformat%& main option) the CRLF line-terminators are included in the count. -.wen .vitem &$message_exim_id$& .vindex "&$message_exim_id$&" @@ -12190,9 +12180,7 @@ deny message = Too many lines in message header In the MAIL and RCPT ACLs, the value is zero because at that stage the message has not yet been received. -.new This variable is not valid if the &%spool_files_wireformat%& option is used. -.wen .vitem &$message_size$& .cindex "size" "of message" @@ -12814,14 +12802,12 @@ argument, that is, the text that follows the command name, with leading white space removed. Following the introduction of &$smtp_command$&, this variable is somewhat redundant, but is retained for backwards compatibility. -.new .vitem &$smtp_command_history$& .cindex SMTP "command history" .vindex "&$smtp_command_history$&" A comma-separated list (with no whitespace) of the most-recent SMTP commands received, in time-order left to right. Only a limited number of commands are remembered. -.wen .vitem &$smtp_count_at_connection_start$& .vindex "&$smtp_count_at_connection_start$&" @@ -12909,10 +12895,8 @@ It is only useful as the argument of a &%certextract%& expansion item, &%md5%&, &%sha1%& or &%sha256%& operator, or a &%def%& condition. -.new &*Note*&: Under current versions of OpenSSL, when a list of more than one file is used for &%tls_certificate%&, this variable is not reliable. -.wen .vitem &$tls_in_peercert$& .vindex "&$tls_in_peercert$&" @@ -14498,13 +14482,11 @@ The CHUNKING extension (RFC3030) will be advertised in the EHLO message to these hosts. Hosts may use the BDAT command as an alternate to DATA. -.new .option commandline_checks_require_admin main boolean &`false`& .cindex "restricting access to features" This option restricts various basic checking features to require an administrative user. This affects most of the &%-b*%& options, such as &%-be%&. -.wen .option debug_store main boolean &`false`& .cindex debugging "memory corruption" @@ -16883,7 +16865,6 @@ as failures in the configuration file. By using this option to override the compiled-in path, it is possible to run tests of Exim without using the standard spool. -.new .option spool_wireformat main boolean false .cindex "spool directory" "file formats" If this option is set, Exim may for some messages use an alternate format @@ -16907,7 +16888,6 @@ will need to be aware of the potential different format. Using any of the ACL conditions noted will negate the reception benefit (as a Unix-mbox-format file is contructed for them). The transimssion benefit is maintained. -.wen .option sqlite_lock_timeout main time 5s .cindex "sqlite lookup type" "lock timeout" @@ -17118,11 +17098,9 @@ is not required the &%tls_advertise_hosts%& option should be set empty. .option tls_certificate main string list&!! unset .cindex "TLS" "server certificate; location of" .cindex "certificate" "server, location of" -.new The value of this option is expanded, and must then be a list of absolute paths to files which contains the server's certificates. Commonly only one file is needed. -.wen The server's private key is also assumed to be in this file if &%tls_privatekey%& is unset. See chapter &<>& for further details. @@ -17132,7 +17110,6 @@ receiving incoming messages as a server. If you want to supply certificates for use when sending messages as a client, you must set the &%tls_certificate%& option in the relevant &(smtp)& transport. -.new &*Note*&: If you use filenames based on IP addresses, change the list separator in the usual way to avoid confusion under IPv6. @@ -17141,7 +17118,6 @@ file is used, the &$tls_in_ourcert$& veriable is unreliable. &*Note*&: OCSP stapling is not usable under OpenSSL when a list of more than one file is used. -.wen If the option contains &$tls_out_sni$& and Exim is built against OpenSSL, then if the OpenSSL build supports TLS extensions and the TLS client sends the @@ -17309,10 +17285,8 @@ further details, see section &<>&. .option tls_privatekey main string list&!! unset .cindex "TLS" "server private key; location of" -.new The value of this option is expanded, and must then be a list of absolute paths to files which contains the server's private keys. -.wen If this option is unset, or if the expansion is forced to fail, or the result is an empty string, the private key is assumed to be in the same file as the server's certificates. See chapter @@ -24099,7 +24073,6 @@ been started will not be passed to a new delivery process for sending another message on the same connection. See section &<>& for an explanation of when this might be needed. -.new .option hosts_noproxy_tls smtp "host list&!!" * .cindex "TLS" "passing connection" .cindex "multiple SMTP deliveries" @@ -24115,7 +24088,6 @@ instead, and the original process maintains the TLS connection and proxies the SMTP connection from and to the new process and any subsequents. The new process has no access to TLS information, so cannot include it in logging. -.wen @@ -27155,10 +27127,8 @@ When using OpenSSL, this option is ignored. (If an API is found to let OpenSSL be configured in this way, let the Exim Maintainers know and we'll likely use it). .next -.new With GnuTLS, if an explicit list is used for the &%tls_privatekey%& main option main option, it must be ordered to match the &%tls_certificate%& list. -.wen .next Some other recently added features may only be available in one or the other. This should be documented with the feature. If the documentation does not @@ -27315,12 +27285,10 @@ tls_require_ciphers = ${if =={$received_port}{25}\ {HIGH:!MD5:!SHA1}} .endd -.new This example will prefer ECDSA-authenticated ciphers over RSA ones: .code tls_require_ciphers = ECDSA:RSA:!COMPLEMENTOFDEFAULT .endd -.wen .section "Requiring specific ciphers or other parameters in GnuTLS" &&& @@ -27428,14 +27396,12 @@ is assumed to be the case. The certificate file may also contain intermediate certificates that need to be sent to the client to enable it to authenticate the server's certificate. -.new For dual-stack (eg. RSA and ECDSA) configurations, these options can be colon-separated lists of file paths. Ciphers using given authentication algorithms require the presence of a suitable certificate to supply the public-key. The server selects among the certificates to present to the client depending on the selected cipher, hence the priority ordering for ciphers will affect which certificate is used. -.wen If you do not understand about certificates and keys, please try to find a source of this background information, which is not Exim-specific. (There are a @@ -27670,11 +27636,10 @@ if it requests it. If the server is Exim, it will request a certificate only if If the &%tls_verify_certificates%& option is set on the &(smtp)& transport, it specifies a collection of expected server certificates. -These may be the system default set (depending on library version), -a file or, -depending on library version, a directory, -must name a file or, -for OpenSSL only (not GnuTLS), a directory. +These may be +the system default set (depending on library version), +a file, +or (depending on library version) a directory. The client verifies the server's certificate against this collection, taking into account any revoked certificates that are in the list defined by &%tls_crl%&. @@ -27814,7 +27779,6 @@ built, then you have SNI support). "SECTmulmessam" .cindex "multiple SMTP deliveries with TLS" .cindex "TLS" "multiple message deliveries" -.new Exim sends multiple messages down the same TCP/IP connection by starting up an entirely new delivery process for each message, passing the socket from one process to the next. This implementation does not fit well with the use @@ -27827,7 +27791,6 @@ unencrypted data stream from and to the delivery processes. An older mode of operation can be enabled on a per-host basis by the &%hosts_noproxy_tls%& option on the &(smtp)& transport. If the host matches this list the proxy process descibed above is not used; instead Exim -.wen shuts down an existing TLS session being run by the delivery process before passing the socket to a new process. The new process may then try to start a new TLS session, and if successful, may try to re-authenticate @@ -29158,11 +29121,9 @@ and cannot depend on content of received headers. Note also that headers cannot be modified by any of the post-data ACLs (DATA, MIME and DKIM). Headers may be modified by routers (subject to the above) and transports. -.new The Received-By: header is generated as soon as the body reception starts, rather than the traditional time after the full message is received; this will affect the timestamp. -.wen All the usual ACLs are called; if one results in the message being rejected, all effort spent in delivery (including the costs on @@ -31098,7 +31059,6 @@ need to use this option unless you know that the called hosts make use of the sender when checking recipients. If used indiscriminately, it reduces the usefulness of callout caching. -.new .vitem &*hold*& This option applies to recipient callouts only. For example: .code @@ -31113,7 +31073,6 @@ The advantage is only gained if there are no callout cache hits if the use_sender option is used, if neither the random nor the use_postmaster option is used, and if no other callouts intervene. -.wen .endlist If you use any of the parameters that set a non-empty sender for the MAIL @@ -31751,7 +31710,6 @@ av_scanner = f-protd:localhost 10200-10204 .endd If you omit the argument, the default values show above are used. -.new .vitem &%f-prot6d%& .cindex "virus scanners" "f-prot6d" The f-prot6d scanner is accessed using the FPSCAND protocol over TCP. @@ -31761,7 +31719,6 @@ For example: av_scanner = f-prot6d:localhost 10200 .endd If you omit the argument, the default values show above are used. -.wen .vitem &%fsecure%& .cindex "virus scanners" "F-Secure" @@ -31811,13 +31768,11 @@ For example: .code av_scanner = sock:127.0.0.1 6001:%s:(SPAM|VIRUS):(.*)$ .endd -.new Note that surrounding whitespace is stripped from each option, meaning there is no way to specify a trailing newline. The socket specifier and both regular-expressions are required. Default for the commandline is &_%s\n_& (note this does have a trailing newline); specify an empty element to get this. -.wen .vitem &%sophie%& .cindex "virus scanners" "Sophos and Sophie" @@ -32657,15 +32612,11 @@ C variables are as follows: .vlist .vitem &*int&~body_linecount*& This variable contains the number of lines in the message's body. -.new It is not valid if the &%spool_files_wireformat%& option is used. -.wen .vitem &*int&~body_zerocount*& This variable contains the number of binary zero bytes in the message's body. -.new It is not valid if the &%spool_files_wireformat%& option is used. -.wen .vitem &*unsigned&~int&~debug_selector*& This variable is set to zero when no debugging is taking place. Otherwise, it @@ -35989,12 +35940,10 @@ SMTP RCPT commands in one transaction) the second and subsequent addresses are flagged with &`->`& instead of &`=>`&. When two or more messages are delivered down a single SMTP connection, an asterisk follows the IP address in the log lines for the second and subsequent messages. -.new When two or more messages are delivered down a single TLS connection, the DNS and some TLS-related information logged for the first message delivered will not be present in the log lines for the second and subsequent messages. TLS cipher information is still available. -.wen .cindex "delivery" "cutthrough; logging" .cindex "cutthrough" "logging" @@ -36370,13 +36319,11 @@ important with the widening use of NAT (see RFC 2505). &%lost_incoming_connection%&: A log line is written when an incoming SMTP connection is unexpectedly dropped. .next -.new .cindex "log" "millisecond timestamps" .cindex millisecond logging .cindex timstamps "millisecond, in logs" &%millisec%&: Timestamps have a period and three decimal places of finer granularity appended to the seconds value. -.wen .next .cindex "log" "outgoing interface" .cindex "log" "local interface" @@ -38120,13 +38067,11 @@ the contents of files on the spool via the Exim monitor (which runs unprivileged), Exim must be built to allow group read access to its spool files. -.new By default, regular users are trusted to perform basic testing and introspection commands, as themselves. This setting can be tightened by setting the &%commandline_checks_require_admin%& option. This affects most of the checking options, such as &%-be%& and anything else &%-b*%&. -.wen .section "Spool files" "SECID275" @@ -38247,12 +38192,10 @@ file remains in existence. When Exim next processes the message, it notices the -J file and uses it to update the -H file before starting the next delivery attempt. -.new Files whose names end with -K or .eml may also be seen in the spool. These are temporaries used for DKIM or malware processing, when that is used. They should be tidied up by normal operations; any old ones are probably relics of crashes and can be removed. -.wen .section "Format of the -H file" "SECID282" .cindex "uid (user id)" "in spool file" @@ -38414,13 +38357,11 @@ to ensure that the caller is displayed in queue listings). If a message was scanned by SpamAssassin, this is present. It records the value of &$spam_score_int$&. -.new .vitem &%-spool_file_wireformat%& The -D file for this message is in wire-format (for ESMTP CHUNKING) rather than Unix-format. The line-ending is CRLF rather than newline. There is still, however, no leading-dot-stuffing. -.wen .vitem &%-tls_certificate_verified%& A TLS certificate was received from the client that sent this message, and the @@ -38529,7 +38470,6 @@ unqualified domain &'foundation'&. .ecindex IIDforspo2 .ecindex IIDforspo3 -.new .section "Format of the -D file" "SECID282a" The data file is traditionally in Unix-standard format: lines are ended with an ASCII newline character. @@ -38541,7 +38481,6 @@ suitable for direct copying to the wire when transmitting using the ESMTP CHUNKING option, meaning lower processing overhead. Lines are terminated with an ASCII CRLF pair. There is no dot-stuffing (and no dot-termination). -.wen . //////////////////////////////////////////////////////////////////////////// . //////////////////////////////////////////////////////////////////////////// @@ -38599,22 +38538,18 @@ These options take (expandable) strings as arguments. .option dkim_domain smtp string list&!! unset The domain(s) you want to sign with. -.new After expansion, this can be a list. Each element in turn is put into the &%$dkim_domain%& expansion variable while expanding the remaining signing options. -.wen If it is empty after expansion, DKIM signing is not done. .option dkim_selector smtp string list&!! unset This sets the key selector string. -.new After expansion, which can use &$dkim_domain$&, this can be a list. Each element in turn is put in the expansion variable &%$dkim_selector%& which may be used in the &%dkim_private_key%& option along with &%$dkim_domain%&. If the option is empty after expansion, DKIM signing is not done for this domain. -.wen .option dkim_private_key smtp string&!! unset This sets the private key to use. @@ -38633,7 +38568,6 @@ is set. .endlist If the option is empty after expansion, DKIM signing is not done. -.new .option dkim_hash smtp string&!! sha256 Can be set alternatively to &"sha1"& to use an alternate hash method. Note that sha1 is now condidered insecure, and deprecated. @@ -38644,7 +38578,6 @@ the signing header. The DKIM standards restrict the permissible syntax of this optional tag to a mail address, with possibly-empty local part, an @, and a domain identical to or subdomain of the "d=" tag value. Note that Exim does not check the value. -.wen .option dkim_canon smtp string&!! unset This option sets the canonicalization method used when signing a message. @@ -38662,7 +38595,6 @@ variables here. .option dkim_sign_headers smtp string&!! "see below" If set, this option must expand to a colon-separated list of header names. -.new Headers with these names, or the absence or such a header, will be included in the message signature. When unspecified, the header names listed in RFC4871 will be used, @@ -38680,7 +38612,6 @@ will be signed. If a '+' prefix if used, all headers that are present with this name will be signed, and one signtature added for a missing header with the name will be appended. -.wen .section "Verifying DKIM signatures in incoming mail" "SECID514" @@ -38729,10 +38660,8 @@ dkim_verify_signers = $sender_address_domain:$dkim_signers If a domain or identity is listed several times in the (expanded) value of &%dkim_verify_signers%&, the ACL is only called once for that domain or identity. -.new If multiple signatures match a domain (or identity), the ACL is called once for each matching signature. -.wen Inside the &%acl_smtp_dkim%&, the following expansion variables are @@ -38761,7 +38690,6 @@ available in &%$dkim_verify_reason%&. &%pass%&: The signature passed verification. It is valid. .endlist -.new This variable can be overwritten using an ACL 'set' modifier. This might, for instance, be done to enforce a policy restriction on hash-method or key-size: @@ -38775,7 +38703,6 @@ hash-method or key-size: After all the DKIM ACL runs have completed, the value becomes a colon-separated list of the values after each run. -.wen .vitem &%$dkim_verify_reason%& A string giving a little bit more detail when &%$dkim_verify_status%& is either @@ -38797,9 +38724,7 @@ re-written or otherwise changed in a way which is incompatible with DKIM verification. It may of course also mean that the signature is forged. .endlist -.new This variable can be overwritten using an ACL 'set' modifier. -.wen .vitem &%$dkim_domain%& The signing domain. IMPORTANT: This variable is only populated if there is @@ -39246,10 +39171,8 @@ The second column in the table above describes whether the event fires before or after the action is associates with. Those which fire before can be used to affect that action (more on this below). -.new The third column in the table above says what section of the configumration should define the event action. -.wen An additional variable, &$event_data$&, is filled with information varying with the event type: diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index fcd5e691f..d4b1820d5 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -5,7 +5,7 @@ affect Exim's operation, with an unchanged configuration file. For new options, and new features, see the NewStuff file next to this ChangeLog. -Exim version 4.next +Exim version 4.91 ----------------- JH/01 Replace the store_release() internal interface with store_newblock(), @@ -209,6 +209,11 @@ HS/03 Bug 2201: Fix checking for leading-dot on a line during headers reading from SMTP input. Previously it was always done; now only done for DATA and not BDAT commands. CVE-2017-16944. +JH/35 Bug 2201: Flush received data in BDAT mode after detecting an error fatal + to the message (such as an overlong header line). Previously this was + not done and we did not exit BDAT mode. Followon from the previous item + though a different problem. + Exim version 4.89 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index f53ce5741..df7055a36 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -6,7 +6,7 @@ Before a formal release, there may be quite a lot of detail so that people can test from the snapshots or the Git before the documentation is updated. Once the documentation is updated, this file is reduced to a short list. -Version 4.next +Version 4.91 -------------- 1. Dual-certificate stacks on servers now support OCSP stapling, under GnuTLS diff --git a/doc/doc-txt/openssl.txt b/doc/doc-txt/openssl.txt index 95ceccc0b..a8d69b690 100644 --- a/doc/doc-txt/openssl.txt +++ b/doc/doc-txt/openssl.txt @@ -38,7 +38,7 @@ something else. `/opt/exim/openssl` perhaps. ./config --prefix=/opt/openssl --openssldir=/etc/ssl \ -L/opt/openssl/lib -Wl,-R/opt/openssl/lib \ - enable-ssl-trace + enable-ssl-trace shared make make install diff --git a/src/src/receive.c b/src/src/receive.c index ae2c93b4e..2b6143a32 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -1023,7 +1023,8 @@ int ch; /* Remember that this message uses wireformat. */ -DEBUG(D_receive) debug_printf("CHUNKING: writing spoolfile in wire format\n"); +DEBUG(D_receive) debug_printf("CHUNKING: %s\n", + fout ? "writing spoolfile in wire format" : "flushing input"); spool_file_wireformat = TRUE; for (;;) @@ -1077,9 +1078,10 @@ Returns: nothing void receive_swallow_smtp(void) { -/*XXX CHUNKING: not enough. read chunks until RSET? */ if (message_ended >= END_NOTENDED) - message_ended = read_message_data_smtp(NULL); + message_ended = chunking_state <= CHUNKING_OFFERED + ? read_message_data_smtp(NULL) + : read_message_bdat_smtp_wire(NULL); } @@ -2046,32 +2048,30 @@ for (;;) these lines in SMTP messages. There is now an option to ignore them from specified hosts or networks. Sigh. */ - if (header_last == header_list && - (!smtp_input - || - (sender_host_address != NULL && - verify_check_host(&ignore_fromline_hosts) == OK) - || - (sender_host_address == NULL && ignore_fromline_local) - ) && - regex_match_and_setup(regex_From, next->text, 0, -1)) + if ( header_last == header_list + && ( !smtp_input + || ( sender_host_address + && verify_check_host(&ignore_fromline_hosts) == OK + ) + || (!sender_host_address && ignore_fromline_local) + ) + && regex_match_and_setup(regex_From, next->text, 0, -1) + ) { if (!sender_address_forced) { uschar *uucp_sender = expand_string(uucp_from_sender); - if (uucp_sender == NULL) - { + if (!uucp_sender) log_write(0, LOG_MAIN|LOG_PANIC, "expansion of \"%s\" failed after matching " "\"From \" line: %s", uucp_from_sender, expand_string_message); - } else { int start, end, domain; uschar *errmess; uschar *newsender = parse_extract_address(uucp_sender, &errmess, &start, &end, &domain, TRUE); - if (newsender != NULL) + if (newsender) { if (domain == 0 && newsender[0] != 0) newsender = rewrite_address_qualify(newsender, FALSE); @@ -2166,13 +2166,11 @@ for (;;) } else - { give_local_error(ERRMESS_VLONGHDRLINE, string_sprintf("message header line longer than %d characters " "received: message not accepted", header_line_maxsize), US"", error_rc, stdin, header_list->next); /* Does not return */ - } } /* Note if any resent- fields exist. */ diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index 7c7362bc7..7735bd971 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -94,6 +94,10 @@ functions from the OpenSSL library. */ # define DISABLE_OCSP #endif +#ifdef EXIM_HAVE_OPENSSL_CHECKHOST +# include +#endif + /* Structure for collecting random data for seeding. */ typedef struct randstuff { @@ -147,8 +151,8 @@ static BOOL reexpand_tls_files_for_sni = FALSE; typedef struct tls_ext_ctx_cb { uschar *certificate; uschar *privatekey; -#ifndef DISABLE_OCSP BOOL is_server; +#ifndef DISABLE_OCSP STACK_OF(X509) *verify_stack; /* chain for verifying the proof */ union { struct { @@ -1490,9 +1494,10 @@ tls_ext_ctx_cb * cbinfo; cbinfo = store_malloc(sizeof(tls_ext_ctx_cb)); cbinfo->certificate = certificate; cbinfo->privatekey = privatekey; +cbinfo->is_server = host==NULL; #ifndef DISABLE_OCSP cbinfo->verify_stack = NULL; -if ((cbinfo->is_server = host==NULL)) +if (!host) { cbinfo->u_ocsp.server.file = ocsp_file; cbinfo->u_ocsp.server.file_expanded = NULL; diff --git a/test/confs/5860 b/test/confs/5860 index 82079fe38..df9115129 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -64,9 +64,11 @@ send_to_server: # hosts_try_dane = * hosts_require_dane = * +.ifdef _HAVE_OCSP hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \ {= {0}{$tls_out_tlsa_usage}} } \ {*}{}} +.endif event_action = ${acl {logger}}