From d6ffd8ef9ebcb2dc913c75ee255459e8ff4fb4da Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 23 Aug 2020 10:02:30 +0100 Subject: tidying --- src/src/acl.c | 6 +-- src/src/functions.h | 2 +- src/src/transport.c | 7 +-- src/src/transports/smtp.c | 7 ++- src/src/transports/smtp.h | 132 +++++++++++++++++++++++----------------------- 5 files changed, 76 insertions(+), 78 deletions(-) diff --git a/src/src/acl.c b/src/src/acl.c index 934112c31..aaf0ce63e 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1371,18 +1371,18 @@ switch (dns_special_lookup(dnsa, domain, T_CSA, &found)) /* If something bad happened (most commonly DNS_AGAIN), defer. */ default: - return t->data.val = CSA_DEFER_SRV; + return t->data.val = CSA_DEFER_SRV; /* If we found nothing, the client's authorization is unknown. */ case DNS_NOMATCH: case DNS_NODATA: - return t->data.val = CSA_UNKNOWN; + return t->data.val = CSA_UNKNOWN; /* We got something! Go on to look at the reply in more detail. */ case DNS_SUCCEED: - break; + break; } /* Scan the reply for well-formed CSA SRV records. */ diff --git a/src/src/functions.h b/src/src/functions.h index e7f643110..cc9137c8b 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -577,7 +577,7 @@ extern void tls_modify_variables(tls_support *); extern uschar *tod_stamp(int); extern BOOL transport_check_waiting(const uschar *, const uschar *, int, uschar *, - BOOL *, oicf, void*); + oicf, void*); extern void transport_init(void); extern void transport_do_pass_socket(const uschar *, const uschar *, const uschar *, uschar *, int); diff --git a/src/src/transport.c b/src/src/transport.c index aed743d62..a04663277 100644 --- a/src/src/transport.c +++ b/src/src/transport.c @@ -1627,7 +1627,6 @@ Arguments: local_message_max maximum number of messages down one connection as set by the caller transport new_message_id set to the message id of a waiting message - more set TRUE if there are yet more messages waiting oicf_func function to call to validate if it is ok to send to this message_id from the current instance. oicf_data opaque data for oicf_func @@ -1643,7 +1642,7 @@ typedef struct msgq_s BOOL transport_check_waiting(const uschar *transport_name, const uschar *hostname, - int local_message_max, uschar *new_message_id, BOOL *more, oicf oicf_func, void *oicf_data) + int local_message_max, uschar *new_message_id, oicf oicf_func, void *oicf_data) { dbdata_wait *host_record; int host_length; @@ -1653,8 +1652,6 @@ open_db *dbm_file; int i; struct stat statbuf; -*more = FALSE; - DEBUG(D_transport) { debug_printf("transport_check_waiting entered\n"); @@ -1858,9 +1855,7 @@ record if required, close the database, and return TRUE. */ if (host_length > 0) { host_record->count = host_length/MESSAGE_ID_LENGTH; - dbfn_write(dbm_file, hostname, host_record, (int)sizeof(dbdata_wait) + host_length); - *more = TRUE; } dbfn_close(dbm_file); diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index fef4717f5..d1deffa6f 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -4160,7 +4160,6 @@ DEBUG(D_transport) if (sx->completed_addr && sx->ok && sx->send_quit) { - BOOL more; smtp_compare_t t_compare; t_compare.tblock = tblock; @@ -4176,7 +4175,7 @@ if (sx->completed_addr && sx->ok && sx->send_quit) && #endif transport_check_waiting(tblock->name, host->name, - tblock->connection_max_messages, new_message_id, &more, + tblock->connection_max_messages, new_message_id, (oicf)smtp_are_same_identities, (void*)&t_compare) ) ) { @@ -4229,6 +4228,10 @@ if (sx->completed_addr && sx->ok && sx->send_quit) if (tls_out.active.sock >= 0) if ( f.continue_more || verify_check_given_host(CUSS &ob->hosts_noproxy_tls, host) == OK) + +/*XXX*/ +/* || sx->conn_args.dane && Ustrcmp( , ob->tls_sni) != 0 */ +/*XXX*/ { /* Before passing the socket on, or returning to caller with it still open, we must shut down TLS. Not all MTAs allow for the continuation diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h index 607a3772d..189ad9caa 100644 --- a/src/src/transports/smtp.h +++ b/src/src/transports/smtp.h @@ -16,94 +16,94 @@ /* Private structure for the private options and other private data. */ typedef struct { - uschar *hosts; - uschar *fallback_hosts; - host_item *hostlist; - host_item *fallback_hostlist; - uschar *authenticated_sender; - uschar *helo_data; - uschar *interface; - uschar *port; - uschar *protocol; - uschar *dscp; - uschar *serialize_hosts; - uschar *hosts_try_auth; - uschar *hosts_require_auth; - uschar *hosts_try_chunking; + uschar *hosts; + uschar *fallback_hosts; + host_item *hostlist; + host_item *fallback_hostlist; + uschar *authenticated_sender; + uschar *helo_data; + uschar *interface; + uschar *port; + uschar *protocol; + uschar *dscp; + uschar *serialize_hosts; + uschar *hosts_try_auth; + uschar *hosts_require_auth; + uschar *hosts_try_chunking; #ifdef SUPPORT_DANE - uschar *hosts_try_dane; - uschar *hosts_require_dane; - uschar *dane_require_tls_ciphers; + uschar *hosts_try_dane; + uschar *hosts_require_dane; + uschar *dane_require_tls_ciphers; #endif - uschar *hosts_try_fastopen; + uschar *hosts_try_fastopen; #ifndef DISABLE_PRDR - uschar *hosts_try_prdr; + uschar *hosts_try_prdr; #endif #ifndef DISABLE_OCSP - uschar *hosts_request_ocsp; - uschar *hosts_require_ocsp; + uschar *hosts_request_ocsp; + uschar *hosts_require_ocsp; #endif - uschar *hosts_require_tls; - uschar *hosts_avoid_tls; - uschar *hosts_verify_avoid_tls; - uschar *hosts_avoid_pipelining; + uschar *hosts_require_tls; + uschar *hosts_avoid_tls; + uschar *hosts_verify_avoid_tls; + uschar *hosts_avoid_pipelining; #ifndef DISABLE_PIPE_CONNECT - uschar *hosts_pipe_connect; + uschar *hosts_pipe_connect; #endif - uschar *hosts_avoid_esmtp; + uschar *hosts_avoid_esmtp; #ifndef DISABLE_TLS - uschar *hosts_nopass_tls; - uschar *hosts_noproxy_tls; -#endif - int command_timeout; - int connect_timeout; - int data_timeout; - int final_timeout; - int size_addition; - int hosts_max_try; - int hosts_max_try_hardlimit; - int message_linelength_limit; - BOOL address_retry_include_sender; - BOOL allow_localhost; - BOOL authenticated_sender_force; - BOOL gethostbyname; - BOOL dns_qualify_single; - BOOL dns_search_parents; + uschar *hosts_nopass_tls; + uschar *hosts_noproxy_tls; +#endif + int command_timeout; + int connect_timeout; + int data_timeout; + int final_timeout; + int size_addition; + int hosts_max_try; + int hosts_max_try_hardlimit; + int message_linelength_limit; + BOOL address_retry_include_sender; + BOOL allow_localhost; + BOOL authenticated_sender_force; + BOOL gethostbyname; + BOOL dns_qualify_single; + BOOL dns_search_parents; dnssec_domains dnssec; - BOOL delay_after_cutoff; - BOOL hosts_override; - BOOL hosts_randomize; - BOOL keepalive; - BOOL lmtp_ignore_quota; - uschar *expand_retry_include_ip_address; - BOOL retry_include_ip_address; + BOOL delay_after_cutoff; + BOOL hosts_override; + BOOL hosts_randomize; + BOOL keepalive; + BOOL lmtp_ignore_quota; + uschar *expand_retry_include_ip_address; + BOOL retry_include_ip_address; #ifdef SUPPORT_SOCKS - uschar *socks_proxy; + uschar *socks_proxy; #endif #ifndef DISABLE_TLS - uschar *tls_certificate; - uschar *tls_crl; - uschar *tls_privatekey; - uschar *tls_require_ciphers; + uschar *tls_certificate; + uschar *tls_crl; + uschar *tls_privatekey; + uschar *tls_require_ciphers; # ifndef DISABLE_TLS_RESUME - uschar *tls_resumption_hosts; + uschar *tls_resumption_hosts; # endif - uschar *tls_sni; - uschar *tls_verify_certificates; - int tls_dh_min_bits; - BOOL tls_tempfail_tryclear; - uschar *tls_verify_hosts; - uschar *tls_try_verify_hosts; - uschar *tls_verify_cert_hostnames; + const uschar *tls_sni; + uschar *tls_verify_certificates; + int tls_dh_min_bits; + BOOL tls_tempfail_tryclear; + uschar *tls_verify_hosts; + uschar *tls_try_verify_hosts; + uschar *tls_verify_cert_hostnames; #endif #ifdef SUPPORT_I18N - uschar *utf8_downconvert; + uschar *utf8_downconvert; #endif #ifndef DISABLE_DKIM struct ob_dkim dkim; #endif #ifdef EXPERIMENTAL_ARC - uschar *arc_sign; + uschar *arc_sign; #endif } smtp_transport_options_block; -- cgit v1.2.3