diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-05-13 12:27:04 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-05-16 19:11:01 +0100 |
| commit | af4a1bca160104a30125a835e2196ec82e790980 (patch) | |
| tree | ed883417128d29261f5ea4c139f50bfc7048ba43 /src | |
| parent | 93dcb1c245e78806b621bbc955b1a316f806e5a3 (diff) | |
General tidying
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/malware.c | 2 | ||||
| -rw-r--r-- | src/src/receive.c | 5 | ||||
| -rw-r--r-- | src/src/tls-openssl.c | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/src/malware.c b/src/src/malware.c index 2d2a8c892..7685554ae 100644 --- a/src/src/malware.c +++ b/src/src/malware.c @@ -1029,7 +1029,6 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking) uschar *p, *vname, *result_tag, *response_end; int bread=0; - unsigned int port; uschar * file_name; uschar av_buffer[1024]; uschar *hostname = US""; @@ -1042,6 +1041,7 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking) int current_server; int num_servers = 0; #ifdef WITH_OLD_CLAMAV_STREAM + unsigned int port; uschar av_buffer2[1024]; int sockData; #else diff --git a/src/src/receive.c b/src/src/receive.c index af8e6de4c..34aa5d91e 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -993,10 +993,11 @@ switch(where) { case ACL_WHERE_DKIM: case ACL_WHERE_MIME: - case ACL_WHERE_DATA: if (cutthrough_fd >= 0 && (acl_removed_headers || acl_added_headers)) + case ACL_WHERE_DATA: + if (cutthrough_fd >= 0 && (acl_removed_headers || acl_added_headers)) { log_write(0, LOG_MAIN|LOG_PANIC, "Header modification in data ACLs" - "will not take effect on cutthrough deliveries"); + " will not take effect on cutthrough deliveries"); return; } } diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index f6ded3c56..4cc6c4422 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -782,11 +782,8 @@ const tls_ext_ctx_cb *cbinfo = (tls_ext_ctx_cb *) arg; uschar *response_der; int response_der_len; -if (log_extra_selector & LX_tls_cipher) - log_write(0, LOG_MAIN, "[%s] Recieved OCSP stapling req;%s responding", - sender_host_address, cbinfo->u_ocsp.server.response ? "":" not"); -else - DEBUG(D_tls) debug_printf("Received TLS status request (OCSP stapling); %s response.", +DEBUG(D_tls) + debug_printf("Received TLS status request (OCSP stapling); %s response.", cbinfo->u_ocsp.server.response ? "have" : "lack"); tls_in.ocsp = OCSP_NOT_RESP; |