OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Dec-2006 12:56:55
Branch: HEAD Handle: 2006123111565500
Modified files:
openpkg-src/milter-greylist
greylist.conf milter-greylist.patch
Log:
do not complain if macro {i} cannot be resolved early (as this fails
in Postfix) and instead retry later (when it works also in Postfix);
enable Greylisting by default and allow one to ignore particular users
only (as this is more useful in practice)
Summary:
Revision Changes Path
1.5 +5 -4 openpkg-src/milter-greylist/greylist.conf
1.4 +36 -6 openpkg-src/milter-greylist/milter-greylist.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/greylist.conf
============================================================================
$ cvs diff -u -r1.4 -r1.5 greylist.conf
--- openpkg-src/milter-greylist/greylist.conf 31 Dec 2006 10:36:41 -0000
1.4
+++ openpkg-src/milter-greylist/greylist.conf 31 Dec 2006 11:56:55 -0000
1.5
@@ -169,17 +169,18 @@
217.158.50.178/32 \ # greylisting.org: AXKit
mailing list (unique sender)
}
-# access control list definition: of users that want Greylisting
-list "greylisted recipients" rcpt { \
+# access control list definition: users who want NO Greylisting
+list "non-greylisted recipients" rcpt { \
[EMAIL PROTECTED] \
[EMAIL PROTECTED] \
[EMAIL PROTECTED] \
}
# access control list
+# (first successful match stops processing)
racl whitelist list "my networks by address"
racl whitelist list "broken peers by domain"
racl whitelist list "broken peers by address"
-racl greylist list "greylisted recipients" delay 10m autowhite 3d
-racl whitelist default
+racl whitelist list "non-greylisted recipients"
+racl greylist default delay 10m autowhite 3d
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/milter-greylist/milter-greylist.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 milter-greylist.patch
--- openpkg-src/milter-greylist/milter-greylist.patch 31 Dec 2006 09:17:22
-0000 1.3
+++ openpkg-src/milter-greylist/milter-greylist.patch 31 Dec 2006 11:56:55
-0000 1.4
@@ -1,6 +1,6 @@
Index: milter-greylist.8
--- milter-greylist.8.orig 2006-08-30 22:50:42 +0200
-+++ milter-greylist.8 2006-12-31 09:57:22 +0100
++++ milter-greylist.8 2006-12-31 12:39:02 +0100
@@ -46,7 +46,7 @@
[\fB-r\fR]
[\fB-S\fR]
@@ -35,8 +35,38 @@
Matthieu Herrb,
Index: milter-greylist.c
--- milter-greylist.c.orig 2006-12-29 19:32:44 +0100
-+++ milter-greylist.c 2006-12-31 09:58:12 +0100
-@@ -1313,6 +1313,11 @@
++++ milter-greylist.c 2006-12-31 12:41:45 +0100
+@@ -334,7 +334,9 @@
+ priv = (struct mlfi_priv *) smfi_getpriv(ctx);
+
+ if ((priv->priv_queueid = smfi_getsymval(ctx, "{i}")) == NULL) {
++#if 0
+ mg_log(LOG_DEBUG, "smfi_getsymval failed for {i}");
++#endif
+ priv->priv_queueid = "(unknown id)";
+ }
+
+@@ -618,6 +620,10 @@
+
+ priv = (struct mlfi_priv *) smfi_getpriv(ctx);
+
++ if (priv->priv_queueid == NULL || strcmp(priv->priv_queueid, "(unknown
id)") == 0)
++ if ((priv->priv_queueid = smfi_getsymval(ctx, "{i}")) == NULL)
++ priv->priv_queueid = "(unknown id)";
++
+ if (priv->priv_msgcount > conf.c_maxpeek) {
+ mg_log(LOG_DEBUG, "ignoring message beyond maxpeek = %d",
+ conf.c_maxpeek);
+@@ -820,6 +826,8 @@
+ ip = "IPv6:::1";
+ }
+ #endif
++ if (ip == NULL)
++ ip = smfi_getsymval(ctx, "{client_addr}");
+ if (ip == NULL) {
+ mg_log(LOG_DEBUG, "smfi_getsymval failed for {if_addr}");
+ ip = "0.0.0.0";
+@@ -1313,6 +1321,11 @@
*/
if (conf.c_user != NULL) {
struct passwd *pw = NULL;
@@ -48,7 +78,7 @@
if ((pw = getpwnam(conf.c_user)) == NULL) {
mg_log(LOG_ERR, "%s: cannot get user %s data: %s",
-@@ -1320,6 +1325,15 @@
+@@ -1320,6 +1333,15 @@
exit(EX_OSERR);
}
@@ -64,7 +94,7 @@
#ifdef HAVE_INITGROUPS
if (initgroups(conf.c_user, pw->pw_gid) != 0) {
mg_log(LOG_ERR, "%s: cannot change "
-@@ -1370,6 +1384,9 @@
+@@ -1370,6 +1392,9 @@
* Here we go!
*/
conf_release();
@@ -74,7 +104,7 @@
exitval = smfi_main();
mg_log(LOG_ERR, "smfi_main() returned %d", exitval);
-@@ -1396,7 +1413,7 @@
+@@ -1396,7 +1421,7 @@
mg_log(LOG_ERR,
" [-f configfile] [-h] [-l] [-q] [-r] [-S] [-T]");
mg_log(LOG_ERR,
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
