Commit | Line | Data |
---|---|---|
89fb561f AM |
1 | --- EDITME.exim4-light 2017-03-04 11:15:58.309895066 +0100 |
2 | +++ EDITME.exim4-heavy 2017-03-04 11:17:12.616522005 +0100 | |
3 | @@ -212,7 +212,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 | #------------------------------------------------------------------------------ | |
89fb561f | 12 | @@ -244,7 +244,7 @@ |
de45f55a AM |
13 | |
14 | SUPPORT_MAILDIR=yes | |
15 | SUPPORT_MAILSTORE=yes | |
16 | -# SUPPORT_MBX=yes | |
17 | +SUPPORT_MBX=yes | |
18 | ||
19 | ||
20 | #------------------------------------------------------------------------------ | |
89fb561f | 21 | @@ -305,15 +305,15 @@ |
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 | |
29 | LOOKUP_NIS=yes | |
30 | # LOOKUP_NISPLUS=yes | |
31 | # LOOKUP_ORACLE=yes | |
32 | LOOKUP_PASSWD=yes | |
33 | -# LOOKUP_PGSQL=yes | |
de45f55a | 34 | +LOOKUP_PGSQL=yes |
89fb561f AM |
35 | # LOOKUP_REDIS=yes |
36 | -# LOOKUP_SQLITE=yes | |
de45f55a AM |
37 | +LOOKUP_SQLITE=yes |
38 | # LOOKUP_SQLITE_PC=sqlite3 | |
39 | # LOOKUP_WHOSON=yes | |
40 | ||
89fb561f | 41 | @@ -334,7 +334,7 @@ |
de45f55a AM |
42 | # with Solaris 7 onwards. Uncomment whichever of these you are using. |
43 | ||
44 | # LDAP_LIB_TYPE=OPENLDAP1 | |
45 | -# LDAP_LIB_TYPE=OPENLDAP2 | |
46 | +LDAP_LIB_TYPE=OPENLDAP2 | |
47 | # LDAP_LIB_TYPE=NETSCAPE | |
48 | # LDAP_LIB_TYPE=SOLARIS | |
49 | ||
89fb561f | 50 | @@ -373,6 +373,9 @@ |
de45f55a AM |
51 | # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 |
52 | ||
53 | ||
54 | +LOOKUP_INCLUDE=-I/usr/include/mysql -I`pg_config --includedir` | |
55 | +LOOKUP_LIBS=-lldap -llber -lmysqlclient -lpq -lsqlite3 | |
56 | + | |
57 | #------------------------------------------------------------------------------ | |
58 | # Compiling the Exim monitor: If you want to compile the Exim monitor, a | |
59 | # program that requires an X11 display, then EXIM_MONITOR should be set to the | |
89fb561f | 60 | @@ -381,7 +384,7 @@ |
de45f55a AM |
61 | # files are defaulted in the OS/Makefile-Default file, but can be overridden in |
62 | # local OS-specific make files. | |
63 | ||
64 | -EXIM_MONITOR=eximon.bin | |
65 | +# EXIM_MONITOR=eximon.bin | |
66 | ||
67 | ||
68 | #------------------------------------------------------------------------------ | |
89fb561f | 69 | @@ -391,7 +394,7 @@ |
de45f55a AM |
70 | # and the MIME ACL. Please read the documentation to learn more about these |
71 | # features. | |
72 | ||
73 | -# WITH_CONTENT_SCAN=yes | |
74 | +WITH_CONTENT_SCAN=yes | |
75 | ||
89fb561f | 76 | #------------------------------------------------------------------------------ |
de45f55a | 77 | # If you're using ClamAV and are backporting fixes to an old version, instead |
89fb561f | 78 | @@ -627,16 +630,16 @@ |
de45f55a AM |
79 | # configuration to make use of the mechanism(s) selected. |
80 | ||
81 | AUTH_CRAM_MD5=yes | |
82 | -# AUTH_CYRUS_SASL=yes | |
83 | -# AUTH_DOVECOT=yes | |
84 | +AUTH_CYRUS_SASL=yes | |
85 | +AUTH_DOVECOT=yes | |
86 | # AUTH_GSASL=yes | |
87 | # AUTH_GSASL_PC=libgsasl | |
88 | # AUTH_HEIMDAL_GSSAPI=yes | |
89 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi | |
89fb561f | 90 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5 |
de45f55a AM |
91 | AUTH_PLAINTEXT=yes |
92 | -# AUTH_SPA=yes | |
89fb561f | 93 | -# AUTH_TLS=yes |
de45f55a | 94 | +AUTH_SPA=yes |
89fb561f | 95 | +AUTH_TLS=yes |
de45f55a | 96 | |
89fb561f AM |
97 | # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1 |
98 | # requires multiple pkg-config files to work with Exim, so the second example | |
99 | @@ -649,7 +652,7 @@ | |
de45f55a AM |
100 | # Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC. |
101 | # Ditto for AUTH_HEIMDAL_GSSAPI(_PC). | |
102 | ||
103 | -# AUTH_LIBS=-lsasl2 | |
104 | +AUTH_LIBS=-lsasl2 | |
105 | # AUTH_LIBS=-lgsasl | |
106 | # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt | |
107 | ||
89fb561f | 108 | @@ -923,7 +926,7 @@ |
de45f55a AM |
109 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
110 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
111 | ||
112 | -# EXIM_PERL=perl.o | |
113 | +EXIM_PERL=perl.o | |
114 | ||
115 | ||
116 | #------------------------------------------------------------------------------ | |
89fb561f | 117 | @@ -933,7 +936,7 @@ |
de45f55a AM |
118 | # that the local_scan API is made available by the linker. You may also need |
119 | # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. | |
120 | ||
121 | -# EXPAND_DLFUNC=yes | |
122 | +EXPAND_DLFUNC=yes | |
123 | ||
124 | ||
125 | #------------------------------------------------------------------------------ | |
89fb561f | 126 | @@ -943,11 +946,11 @@ |
de45f55a AM |
127 | # support, which is intended for use in conjunction with the SMTP AUTH |
128 | # facilities, is included only when requested by the following setting: | |
129 | ||
130 | -# SUPPORT_PAM=yes | |
131 | +SUPPORT_PAM=yes | |
132 | ||
133 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
134 | # GNU/Linux -ldl is also needed. | |
135 | -EXTRALIBS=-ldl | |
136 | +EXTRALIBS=-lpam -export-dynamic | |
137 | ||
138 | ||
139 | #------------------------------------------------------------------------------ | |
89fb561f AM |
140 | @@ -961,7 +964,7 @@ |
141 | # If you may want to use inbound (server-side) proxying, using Proxy Protocol, | |
142 | # uncomment the line below. | |
143 | ||
144 | -# SUPPORT_PROXY=yes | |
145 | +SUPPORT_PROXY=yes | |
146 | ||
147 | ||
148 | #------------------------------------------------------------------------------ | |
149 | @@ -1299,7 +1302,7 @@ | |
de45f55a AM |
150 | # local part) can be increased by changing this value. It should be set to |
151 | # a multiple of 16. | |
152 | ||
153 | -# MAX_NAMED_LIST=16 | |
154 | +MAX_NAMED_LIST=32 | |
155 | ||
156 | ||
157 | #------------------------------------------------------------------------------ |