Commit | Line | Data |
---|---|---|
de45f55a AM |
1 | --- EDITME.exim4-light 2012-05-18 20:11:24.000000000 +0200 |
2 | +++ EDITME.exim4-heavy 2012-05-18 20:13:56.000000000 +0200 | |
3 | @@ -212,7 +212,7 @@ ROUTER_REDIRECT=yes | |
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 | #------------------------------------------------------------------------------ | |
12 | @@ -244,7 +244,7 @@ TRANSPORT_LMTP=yes | |
13 | ||
14 | SUPPORT_MAILDIR=yes | |
15 | SUPPORT_MAILSTORE=yes | |
16 | -# SUPPORT_MBX=yes | |
17 | +SUPPORT_MBX=yes | |
18 | ||
19 | ||
20 | #------------------------------------------------------------------------------ | |
21 | @@ -300,14 +300,14 @@ LOOKUP_DNSDB=yes | |
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 | |
34 | -# LOOKUP_SQLITE=yes | |
35 | +LOOKUP_PGSQL=yes | |
36 | +LOOKUP_SQLITE=yes | |
37 | # LOOKUP_SQLITE_PC=sqlite3 | |
38 | # LOOKUP_WHOSON=yes | |
39 | ||
40 | @@ -328,7 +328,7 @@ LOOKUP_PASSWD=yes | |
41 | # with Solaris 7 onwards. Uncomment whichever of these you are using. | |
42 | ||
43 | # LDAP_LIB_TYPE=OPENLDAP1 | |
44 | -# LDAP_LIB_TYPE=OPENLDAP2 | |
45 | +LDAP_LIB_TYPE=OPENLDAP2 | |
46 | # LDAP_LIB_TYPE=NETSCAPE | |
47 | # LDAP_LIB_TYPE=SOLARIS | |
48 | ||
49 | @@ -366,6 +366,9 @@ LOOKUP_PASSWD=yes | |
50 | # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 | |
51 | ||
52 | ||
53 | +LOOKUP_INCLUDE=-I/usr/include/mysql -I`pg_config --includedir` | |
54 | +LOOKUP_LIBS=-lldap -llber -lmysqlclient -lpq -lsqlite3 | |
55 | + | |
56 | #------------------------------------------------------------------------------ | |
57 | # Compiling the Exim monitor: If you want to compile the Exim monitor, a | |
58 | # program that requires an X11 display, then EXIM_MONITOR should be set to the | |
59 | @@ -374,7 +377,7 @@ LOOKUP_PASSWD=yes | |
60 | # files are defaulted in the OS/Makefile-Default file, but can be overridden in | |
61 | # local OS-specific make files. | |
62 | ||
63 | -EXIM_MONITOR=eximon.bin | |
64 | +# EXIM_MONITOR=eximon.bin | |
65 | ||
66 | ||
67 | #------------------------------------------------------------------------------ | |
68 | @@ -384,14 +387,14 @@ EXIM_MONITOR=eximon.bin | |
69 | # and the MIME ACL. Please read the documentation to learn more about these | |
70 | # features. | |
71 | ||
72 | -# WITH_CONTENT_SCAN=yes | |
73 | +WITH_CONTENT_SCAN=yes | |
74 | ||
75 | # If you want to use the deprecated "demime" condition in the DATA ACL, | |
76 | # uncomment the line below. Doing so will also explicitly turn on the | |
77 | # WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of | |
78 | # the "demime" condition. | |
79 | ||
80 | -# WITH_OLD_DEMIME=yes | |
81 | +WITH_OLD_DEMIME=yes | |
82 | ||
83 | # If you're using ClamAV and are backporting fixes to an old version, instead | |
84 | # of staying current (which is the more usual approach) then you may need to | |
85 | @@ -578,14 +581,14 @@ WHITELIST_D_MACROS=OUTGOING | |
86 | # configuration to make use of the mechanism(s) selected. | |
87 | ||
88 | AUTH_CRAM_MD5=yes | |
89 | -# AUTH_CYRUS_SASL=yes | |
90 | -# AUTH_DOVECOT=yes | |
91 | +AUTH_CYRUS_SASL=yes | |
92 | +AUTH_DOVECOT=yes | |
93 | # AUTH_GSASL=yes | |
94 | # AUTH_GSASL_PC=libgsasl | |
95 | # AUTH_HEIMDAL_GSSAPI=yes | |
96 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi | |
97 | AUTH_PLAINTEXT=yes | |
98 | -# AUTH_SPA=yes | |
99 | +AUTH_SPA=yes | |
100 | ||
101 | ||
102 | #------------------------------------------------------------------------------ | |
103 | @@ -595,7 +598,7 @@ AUTH_PLAINTEXT=yes | |
104 | # Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC. | |
105 | # Ditto for AUTH_HEIMDAL_GSSAPI(_PC). | |
106 | ||
107 | -# AUTH_LIBS=-lsasl2 | |
108 | +AUTH_LIBS=-lsasl2 | |
109 | # AUTH_LIBS=-lgsasl | |
110 | # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt | |
111 | ||
112 | @@ -830,7 +833,7 @@ ZCAT_COMMAND=/bin/zcat | |
113 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded | |
114 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
115 | ||
116 | -# EXIM_PERL=perl.o | |
117 | +EXIM_PERL=perl.o | |
118 | ||
119 | ||
120 | #------------------------------------------------------------------------------ | |
121 | @@ -840,7 +843,7 @@ ZCAT_COMMAND=/bin/zcat | |
122 | # that the local_scan API is made available by the linker. You may also need | |
123 | # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. | |
124 | ||
125 | -# EXPAND_DLFUNC=yes | |
126 | +EXPAND_DLFUNC=yes | |
127 | ||
128 | ||
129 | #------------------------------------------------------------------------------ | |
130 | @@ -850,11 +853,11 @@ ZCAT_COMMAND=/bin/zcat | |
131 | # support, which is intended for use in conjunction with the SMTP AUTH | |
132 | # facilities, is included only when requested by the following setting: | |
133 | ||
134 | -# SUPPORT_PAM=yes | |
135 | +SUPPORT_PAM=yes | |
136 | ||
137 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
138 | # GNU/Linux -ldl is also needed. | |
139 | -EXTRALIBS=-ldl | |
140 | +EXTRALIBS=-lpam -export-dynamic | |
141 | ||
142 | ||
143 | #------------------------------------------------------------------------------ | |
144 | @@ -1174,7 +1177,7 @@ TMPDIR="/tmp" | |
145 | # local part) can be increased by changing this value. It should be set to | |
146 | # a multiple of 16. | |
147 | ||
148 | -# MAX_NAMED_LIST=16 | |
149 | +MAX_NAMED_LIST=32 | |
150 | ||
151 | ||
152 | #------------------------------------------------------------------------------ |