Integrate changes from 4.92

[hcoop/config/exim.git] / conf.d / main / 01_exim4-config_listmacrosdefs

diff --git a/conf.d/main/01_exim4-config_listmacrosdefs b/conf.d/main/01_exim4-config_listmacrosdefs
index f1e4268..01214de 100644 (file)
--- a/conf.d/main/01_exim4-config_listmacrosdefs
+++ b/conf.d/main/01_exim4-config_listmacrosdefs
@@ -82,37 +82,11 @@ LOCAL_DELIVERY=mail_spool
 gecos_pattern = ^([^,:]*)
 gecos_name = $1
 
-# define macros to be used in acl/30_exim4-config_check_rcpt to check
-# recipient local parts for strange characters.
-
-# This macro definition really should be in
-# acl/30_exim4-config_check_rcpt but cannot be there due to
-# http://www.exim.org/bugzilla/show_bug.cgi?id=101 as of exim 4.62.
-
-# These macros are documented in acl/30_exim4-config_check_rcpt,
-# can be changed here or overridden by a locally added configuration
-# file as described in README.Debian section "Using Exim Macros to control
-# the configuration".
-
-.ifndef CHECK_RCPT_LOCAL_LOCALPARTS
-CHECK_RCPT_LOCAL_LOCALPARTS = ^[.] : ^.*[@%!/|`#&?]
-.endif
-
-.ifndef CHECK_RCPT_REMOTE_LOCALPARTS
-CHECK_RCPT_REMOTE_LOCALPARTS = ^[./|] : ^.*[@%!`#&?] : ^.*/\\.\\./
-.endif
-
-# always log tls_peerdn as we use TLS for outgoing connects by default
-.ifndef MAIN_LOG_SELECTOR
-MAIN_LOG_SELECTOR = +smtp_protocol_error +smtp_syntax_error +tls_certificate_verified +tls_peerdn
-.endif
-
 # always log tls_peerdn as we use TLS for outgoing connects by default
-# hcoop-change: add +tls_ciper
+# hcoop-change: add +tls_cipher
 .ifndef MAIN_LOG_SELECTOR
-MAIN_LOG_SELECTOR = +tls_cipher +tls_peerdn
+MAIN_LOG_SELECTOR = +smtp_protocol_error +smtp_syntax_error +tls_certificate_verified +tls_peerdn +tls_cipher
 .endif
-
 # hcoop-change: use file_transport = address_file for /etc/aliases
 # delivery, as per old configuration
 SYSTEM_ALIASES_FILE_TRANSPORT = address_file