Commit | Line | Data |
---|---|---|
01e60269 AM |
1 | --- EDITME.exim4-light 2019-04-16 15:54:51.009790678 +0000 |
2 | +++ EDITME.exim4-heavy 2019-04-16 15:54:44.177917231 +0000 | |
3 | @@ -217,7 +217,7 @@ | |
de45f55a AM |
4 | |
5 | # This one is very special-purpose, so is not included by default. | |
6 | ||
7 | -# ROUTER_IPLOOKUP=yes | |
8 | +ROUTER_IPLOOKUP=yes | |
9 | ||
10 | ||
11 | #------------------------------------------------------------------------------ | |
01e60269 | 12 | @@ -249,7 +249,7 @@ |
de45f55a AM |
13 | |
14 | SUPPORT_MAILDIR=yes | |
15 | SUPPORT_MAILSTORE=yes | |
16 | -# SUPPORT_MBX=yes | |
17 | +SUPPORT_MBX=yes | |
18 | ||
19 | ||
20 | #------------------------------------------------------------------------------ | |
01e60269 | 21 | @@ -310,16 +310,16 @@ |
de45f55a AM |
22 | LOOKUP_CDB=yes |
23 | LOOKUP_DSEARCH=yes | |
24 | # LOOKUP_IBASE=yes | |
25 | -# LOOKUP_LDAP=yes | |
26 | -# LOOKUP_MYSQL=yes | |
27 | +LOOKUP_LDAP=yes | |
28 | +LOOKUP_MYSQL=yes | |
01e60269 | 29 | # LOOKUP_MYSQL_PC=mariadb |
de45f55a AM |
30 | LOOKUP_NIS=yes |
31 | # LOOKUP_NISPLUS=yes | |
32 | # LOOKUP_ORACLE=yes | |
33 | LOOKUP_PASSWD=yes | |
34 | -# LOOKUP_PGSQL=yes | |
de45f55a | 35 | +LOOKUP_PGSQL=yes |
0baa7b9d SB |
36 | # LOOKUP_REDIS=yes |
37 | -# LOOKUP_SQLITE=yes | |
de45f55a AM |
38 | +LOOKUP_SQLITE=yes |
39 | # LOOKUP_SQLITE_PC=sqlite3 | |
40 | # LOOKUP_WHOSON=yes | |
41 | ||
01e60269 | 42 | @@ -340,7 +340,7 @@ |
de45f55a AM |
43 | # with Solaris 7 onwards. Uncomment whichever of these you are using. |
44 | ||
45 | # LDAP_LIB_TYPE=OPENLDAP1 | |
46 | -# LDAP_LIB_TYPE=OPENLDAP2 | |
47 | +LDAP_LIB_TYPE=OPENLDAP2 | |
48 | # LDAP_LIB_TYPE=NETSCAPE | |
49 | # LDAP_LIB_TYPE=SOLARIS | |
50 | ||
01e60269 | 51 | @@ -385,6 +385,9 @@ |
de45f55a AM |
52 | # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 |
53 | ||
54 | ||
55 | +LOOKUP_INCLUDE=-I/usr/include/mysql -I`pg_config --includedir` | |
56 | +LOOKUP_LIBS=-lldap -llber -lmysqlclient -lpq -lsqlite3 | |
57 | + | |
58 | #------------------------------------------------------------------------------ | |
59 | # Compiling the Exim monitor: If you want to compile the Exim monitor, a | |
60 | # program that requires an X11 display, then EXIM_MONITOR should be set to the | |
01e60269 | 61 | @@ -393,7 +396,7 @@ |
de45f55a AM |
62 | # files are defaulted in the OS/Makefile-Default file, but can be overridden in |
63 | # local OS-specific make files. | |
64 | ||
65 | -EXIM_MONITOR=eximon.bin | |
66 | +# EXIM_MONITOR=eximon.bin | |
67 | ||
68 | ||
69 | #------------------------------------------------------------------------------ | |
01e60269 | 70 | @@ -403,7 +406,7 @@ |
de45f55a AM |
71 | # and the MIME ACL. Please read the documentation to learn more about these |
72 | # features. | |
73 | ||
74 | -# WITH_CONTENT_SCAN=yes | |
75 | +WITH_CONTENT_SCAN=yes | |
76 | ||
01e60269 AM |
77 | # If you have content scanning you may wish to only include some of the scanner |
78 | # interfaces. Uncomment any of these lines to remove that code. | |
79 | @@ -645,16 +648,16 @@ | |
de45f55a AM |
80 | # configuration to make use of the mechanism(s) selected. |
81 | ||
82 | AUTH_CRAM_MD5=yes | |
83 | -# AUTH_CYRUS_SASL=yes | |
84 | -# AUTH_DOVECOT=yes | |
85 | +AUTH_CYRUS_SASL=yes | |
86 | +AUTH_DOVECOT=yes | |
87 | # AUTH_GSASL=yes | |
88 | # AUTH_GSASL_PC=libgsasl | |
89 | # AUTH_HEIMDAL_GSSAPI=yes | |
90 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi | |
0baa7b9d | 91 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5 |
de45f55a AM |
92 | AUTH_PLAINTEXT=yes |
93 | -# AUTH_SPA=yes | |
0baa7b9d | 94 | -# AUTH_TLS=yes |
de45f55a | 95 | +AUTH_SPA=yes |
0baa7b9d | 96 | +AUTH_TLS=yes |
de45f55a | 97 | |
0baa7b9d SB |
98 | # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1 |
99 | # requires multiple pkg-config files to work with Exim, so the second example | |
01e60269 | 100 | @@ -667,7 +670,7 @@ |
de45f55a AM |
101 | # Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC. |
102 | # Ditto for AUTH_HEIMDAL_GSSAPI(_PC). | |
103 | ||
104 | -# AUTH_LIBS=-lsasl2 | |
105 | +AUTH_LIBS=-lsasl2 | |
106 | # AUTH_LIBS=-lgsasl | |
107 | # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt | |
108 | ||
01e60269 | 109 | @@ -945,7 +948,7 @@ |
de45f55a AM |
110 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
111 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
112 | ||
113 | -# EXIM_PERL=perl.o | |
114 | +EXIM_PERL=perl.o | |
115 | ||
116 | ||
117 | #------------------------------------------------------------------------------ | |
01e60269 | 118 | @@ -955,7 +958,7 @@ |
de45f55a AM |
119 | # that the local_scan API is made available by the linker. You may also need |
120 | # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. | |
121 | ||
122 | -# EXPAND_DLFUNC=yes | |
123 | +EXPAND_DLFUNC=yes | |
124 | ||
125 | ||
126 | #------------------------------------------------------------------------------ | |
01e60269 | 127 | @@ -965,11 +968,11 @@ |
de45f55a AM |
128 | # support, which is intended for use in conjunction with the SMTP AUTH |
129 | # facilities, is included only when requested by the following setting: | |
130 | ||
131 | -# SUPPORT_PAM=yes | |
132 | +SUPPORT_PAM=yes | |
133 | ||
134 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
135 | # GNU/Linux -ldl is also needed. | |
136 | -EXTRALIBS=-ldl | |
137 | +EXTRALIBS=-lpam -export-dynamic | |
138 | ||
139 | ||
140 | #------------------------------------------------------------------------------ | |
01e60269 | 141 | @@ -983,7 +986,7 @@ |
0baa7b9d SB |
142 | # If you may want to use inbound (server-side) proxying, using Proxy Protocol, |
143 | # uncomment the line below. | |
144 | ||
145 | -# SUPPORT_PROXY=yes | |
146 | +SUPPORT_PROXY=yes | |
147 | ||
148 | ||
149 | #------------------------------------------------------------------------------ | |
01e60269 | 150 | @@ -1338,7 +1341,7 @@ |
de45f55a AM |
151 | # local part) can be increased by changing this value. It should be set to |
152 | # a multiple of 16. | |
153 | ||
154 | -# MAX_NAMED_LIST=16 | |
155 | +MAX_NAMED_LIST=32 | |
156 | ||
157 | ||
158 | #------------------------------------------------------------------------------ |