892636a58d
Resolves: rhbz#1527710 Fixed buffer overflow in utility function Resolves: CVE-2018-6789 Updated and defuzzified patches Dropped mariadb-macro-fix patch (not needed) Dropped CVE-2017-1000369, calloutsize, CVE-2017-16943, CVE-2017-16944 patches (all upstreamed)
79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
diff --git a/src/configure.default b/src/configure.default
|
|
index 1138335..0675b40 100644
|
|
--- a/src/configure.default
|
|
+++ b/src/configure.default
|
|
@@ -142,7 +142,7 @@ acl_smtp_data = acl_check_data
|
|
|
|
# Allow any client to use TLS.
|
|
|
|
-# tls_advertise_hosts = *
|
|
+tls_advertise_hosts = *
|
|
|
|
# Specify the location of the Exim server's TLS certificate and private key.
|
|
# The private key must not be encrypted (password protected). You can put
|
|
@@ -150,8 +150,8 @@ acl_smtp_data = acl_check_data
|
|
# need the first setting, or in separate files, in which case you need both
|
|
# options.
|
|
|
|
-# tls_certificate = /etc/ssl/exim.crt
|
|
-# tls_privatekey = /etc/ssl/exim.pem
|
|
+tls_certificate = /etc/pki/tls/certs/exim.pem
|
|
+tls_privatekey = /etc/pki/tls/private/exim.pem
|
|
|
|
# For OpenSSL, prefer EC- over RSA-authenticated ciphers
|
|
# tls_require_ciphers = ECDSA:RSA:!COMPLEMENTOFDEFAULT
|
|
@@ -165,8 +165,8 @@ acl_smtp_data = acl_check_data
|
|
# them you should also allow TLS-on-connect on the traditional but
|
|
# non-standard port 465.
|
|
|
|
-# daemon_smtp_ports = 25 : 465 : 587
|
|
-# tls_on_connect_ports = 465
|
|
+daemon_smtp_ports = 25 : 465 : 587
|
|
+tls_on_connect_ports = 465
|
|
|
|
|
|
# Specify the domain you want to be added to all unqualified addresses
|
|
@@ -224,6 +224,24 @@ never_users = root
|
|
|
|
host_lookup = *
|
|
|
|
+# This setting, if uncommented, allows users to authenticate using
|
|
+# their system passwords against saslauthd if they connect over a
|
|
+# secure connection. If you have network logins such as NIS or
|
|
+# Kerberos rather than only local users, then you possibly also want
|
|
+# to configure /etc/sysconfig/saslauthd to use the 'pam' mechanism
|
|
+# too. Once a user is authenticated, the acl_check_rcpt ACL then
|
|
+# allows them to relay through the system.
|
|
+#
|
|
+# auth_advertise_hosts = ${if eq {$tls_cipher}{}{}{*}}
|
|
+#
|
|
+# By default, we set this option to allow SMTP AUTH from nowhere
|
|
+# (Exim's default would be to allow it from anywhere, even on an
|
|
+# unencrypted connection).
|
|
+#
|
|
+# Comment this one out if you uncomment the above. Did you make sure
|
|
+# saslauthd is actually running first?
|
|
+#
|
|
+auth_advertise_hosts =
|
|
|
|
# The settings below cause Exim to make RFC 1413 (ident) callbacks
|
|
# for all incoming SMTP calls. You can limit the hosts to which these
|
|
@@ -847,7 +865,7 @@ begin authenticators
|
|
# driver = plaintext
|
|
# server_set_id = $auth2
|
|
# server_prompts = :
|
|
-# server_condition = Authentication is not yet configured
|
|
+# server_condition = ${if saslauthd{{$2}{$3}{smtp}} {1}}
|
|
# server_advertise_condition = ${if def:tls_in_cipher }
|
|
|
|
# LOGIN authentication has traditional prompts and responses. There is no
|
|
@@ -859,7 +877,7 @@ begin authenticators
|
|
# driver = plaintext
|
|
# server_set_id = $auth1
|
|
# server_prompts = <| Username: | Password:
|
|
-# server_condition = Authentication is not yet configured
|
|
+# server_condition = ${if saslauthd{{$1}{$2}{smtp}} {1}}
|
|
# server_advertise_condition = ${if def:tls_in_cipher }
|
|
|
|
|