|
 |
be4f17c |
diff -uNr exim-4.69-new/src/configure.default exim-4.69/src/configure.default
|
|
|
be4f17c |
--- exim-4.69-new/src/configure.default 2008-08-13 15:15:01.000000000 +0100
|
|
|
be4f17c |
+++ exim-4.69/src/configure.default 2008-08-13 15:16:44.000000000 +0100
|
|
|
be4f17c |
@@ -140,7 +140,7 @@
|
|
|
cda8379 |
|
|
|
5bfed37 |
# Allow any client to use TLS.
|
|
|
cda8379 |
|
|
|
5bfed37 |
-# tls_advertise_hosts = *
|
|
|
cda8379 |
+tls_advertise_hosts = *
|
|
|
5bfed37 |
|
|
|
5bfed37 |
# Specify the location of the Exim server's TLS certificate and private key.
|
|
|
5bfed37 |
# The private key must not be encrypted (password protected). You can put
|
|
|
be4f17c |
@@ -148,8 +148,8 @@
|
|
|
5bfed37 |
# need the first setting, or in separate files, in which case you need both
|
|
|
5bfed37 |
# options.
|
|
|
5bfed37 |
|
|
|
5bfed37 |
-# tls_certificate = /etc/ssl/exim.crt
|
|
|
5bfed37 |
-# tls_privatekey = /etc/ssl/exim.pem
|
|
|
c11786b |
+tls_certificate = /etc/pki/tls/certs/exim.pem
|
|
|
c11786b |
+tls_privatekey = /etc/pki/tls/private/exim.pem
|
|
|
5bfed37 |
|
|
|
5bfed37 |
# In order to support roaming users who wish to send email from anywhere,
|
|
|
5bfed37 |
# you may want to make Exim listen on other ports as well as port 25, in
|
|
|
be4f17c |
@@ -160,8 +160,8 @@
|
|
|
5bfed37 |
# them you should also allow TLS-on-connect on the traditional but
|
|
|
5bfed37 |
# non-standard port 465.
|
|
|
5bfed37 |
|
|
|
5bfed37 |
-# daemon_smtp_ports = 25 : 465 : 587
|
|
|
5bfed37 |
-# tls_on_connect_ports = 465
|
|
|
5bfed37 |
+daemon_smtp_ports = 25 : 465 : 587
|
|
|
5bfed37 |
+tls_on_connect_ports = 465
|
|
|
5bfed37 |
|
|
|
5bfed37 |
|
|
|
5bfed37 |
# Specify the domain you want to be added to all unqualified addresses
|
|
|
be4f17c |
@@ -219,6 +219,24 @@
|
|
|
5bfed37 |
|
|
|
be4f17c |
host_lookup = *
|
|
|
5bfed37 |
|
|
|
cda8379 |
+# This setting, if uncommented, allows users to authenticate using
|
|
|
cda8379 |
+# their system passwords against saslauthd if they connect over a
|
|
|
cda8379 |
+# secure connection. If you have network logins such as NIS or
|
|
|
cda8379 |
+# Kerberos rather than only local users, then you possibly also want
|
|
|
cda8379 |
+# to configure /etc/sysconfig/saslauthd to use the 'pam' mechanism
|
|
|
cda8379 |
+# too. Once a user is authenticated, the acl_check_rcpt ACL then
|
|
|
cda8379 |
+# allows them to relay through the system.
|
|
|
cda8379 |
+#
|
|
|
cda8379 |
+# auth_advertise_hosts = ${if eq {$tls_cipher}{}{}{*}}
|
|
|
cda8379 |
+#
|
|
|
cda8379 |
+# By default, we set this option to allow SMTP AUTH from nowhere
|
|
|
cda8379 |
+# (Exim's default would be to allow it from anywhere, even on an
|
|
|
cda8379 |
+# unencrypted connection).
|
|
|
cda8379 |
+#
|
|
|
cda8379 |
+# Comment this one out if you uncomment the above. Did you make sure
|
|
|
cda8379 |
+# saslauthd is actually running first?
|
|
|
cda8379 |
+#
|
|
|
cda8379 |
+auth_advertise_hosts =
|
|
|
cda8379 |
|
|
|
be4f17c |
# The settings below, which are actually the same as the defaults in the
|
|
|
be4f17c |
# code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP
|
|
|
be4f17c |
@@ -756,7 +774,7 @@
|
|
|
5bfed37 |
# driver = plaintext
|
|
|
5bfed37 |
# server_set_id = $auth2
|
|
|
5bfed37 |
# server_prompts = :
|
|
|
5bfed37 |
-# server_condition = Authentication is not yet configured
|
|
|
5bfed37 |
+# server_condition = ${if saslauthd{{$2}{$3}{smtp}} {1}}
|
|
|
5bfed37 |
# server_advertise_condition = ${if def:tls_cipher }
|
|
|
cda8379 |
|
|
|
5bfed37 |
# LOGIN authentication has traditional prompts and responses. There is no
|
|
|
be4f17c |
@@ -768,7 +786,7 @@
|
|
|
5bfed37 |
# driver = plaintext
|
|
|
5bfed37 |
# server_set_id = $auth1
|
|
|
5bfed37 |
# server_prompts = <| Username: | Password:
|
|
|
5bfed37 |
-# server_condition = Authentication is not yet configured
|
|
|
5bfed37 |
+# server_condition = ${if saslauthd{{$1}{$2}{smtp}} {1}}
|
|
|
5bfed37 |
# server_advertise_condition = ${if def:tls_cipher }
|
|
|
cda8379 |
|
|
|
cda8379 |
|