|
|
@@ -1,6 +1,6 @@
|
|
|
Index: acl.c
|
|
|
---- acl.c.orig 2007-02-14 06:39:16 +0100
|
|
|
-+++ acl.c 2007-03-02 10:28:02 +0100
|
|
|
+--- acl.c.orig 2007-04-16 04:39:10 +0200
|
|
|
++++ acl.c 2007-05-05 09:35:39 +0200
|
|
|
@@ -58,7 +58,7 @@
|
|
|
#include <sys/stat.h>
|
|
|
#include <netinet/in.h>
|
|
|
@@ -11,8 +11,8 @@ Index: acl.c
|
|
|
#include "acl.h"
|
|
|
#include "conf.h"
|
|
|
Index: acl.h
|
|
|
---- acl.h.orig 2007-02-05 07:05:34 +0100
|
|
|
-+++ acl.h 2007-03-02 10:28:02 +0100
|
|
|
+--- acl.h.orig 2007-03-22 06:39:16 +0100
|
|
|
++++ acl.h 2007-05-05 09:35:39 +0200
|
|
|
@@ -46,7 +46,7 @@
|
|
|
#include <sys/types.h>
|
|
|
#include <netinet/in.h>
|
|
|
@@ -22,9 +22,21 @@ Index: acl.h
|
|
|
|
|
|
typedef enum { A_GREYLIST, A_WHITELIST, A_BLACKLIST, } acl_type_t;
|
|
|
typedef enum { AS_NONE, AS_RCPT, AS_DATA, AS_ANY, } acl_stage_t;
|
|
|
+Index: configure
|
|
|
+--- configure.orig 2007-05-05 03:36:08 +0200
|
|
|
++++ configure 2007-05-05 09:35:58 +0200
|
|
|
+@@ -2545,7 +2545,7 @@
|
|
|
+ echo "$as_me: error: flex not found" >&2;}
|
|
|
+ { (exit 1); exit 1; }; }
|
|
|
+ fi
|
|
|
+-if test -z "`echo %%|$LEX -t --noyywrap|grep yypop_buffer_state`"; then
|
|
|
++if false; then
|
|
|
+ { { echo "$as_me:$LINENO: error: flex missing yypop_buffer_state - upgrade to version 2.5.33 or later" >&5
|
|
|
+ echo "$as_me: error: flex missing yypop_buffer_state - upgrade to version 2.5.33 or later" >&2;}
|
|
|
+ { (exit 1); exit 1; }; }
|
|
|
Index: list.c
|
|
|
--- list.c.orig 2006-12-29 19:32:44 +0100
|
|
|
-+++ list.c 2007-03-02 10:28:02 +0100
|
|
|
++++ list.c 2007-05-05 09:35:39 +0200
|
|
|
@@ -45,7 +45,7 @@
|
|
|
#include <errno.h>
|
|
|
#include <sysexits.h>
|
|
|
@@ -35,8 +47,8 @@ Index: list.c
|
|
|
#ifdef HAVE_OLD_QUEUE_H
|
|
|
#include "queue.h"
|
|
|
Index: macro.c
|
|
|
---- macro.c.orig 2006-12-29 19:32:44 +0100
|
|
|
-+++ macro.c 2007-03-02 10:28:02 +0100
|
|
|
+--- macro.c.orig 2007-03-26 21:29:04 +0200
|
|
|
++++ macro.c 2007-05-05 09:35:39 +0200
|
|
|
@@ -45,7 +45,7 @@
|
|
|
#include <syslog.h>
|
|
|
#include <errno.h>
|
|
|
@@ -47,8 +59,8 @@ Index: macro.c
|
|
|
#ifdef HAVE_OLD_QUEUE_H
|
|
|
#include "queue.h"
|
|
|
Index: milter-greylist.c
|
|
|
---- milter-greylist.c.orig 2007-02-14 06:12:40 +0100
|
|
|
-+++ milter-greylist.c 2007-03-02 10:28:21 +0100
|
|
|
+--- milter-greylist.c.orig 2007-05-04 22:29:50 +0200
|
|
|
++++ milter-greylist.c 2007-05-05 09:35:39 +0200
|
|
|
@@ -77,7 +77,7 @@
|
|
|
static int check_drac(char *dotted_ip);
|
|
|
#endif
|
|
|
@@ -58,9 +70,9 @@ Index: milter-greylist.c
|
|
|
|
|
|
#include "dump.h"
|
|
|
#include "acl.h"
|
|
|
-@@ -107,9 +107,7 @@
|
|
|
- static void set_sr_defaults(struct mlfi_priv *, char *, char *, char *);
|
|
|
- static sfsistat stat_from_code(char *);
|
|
|
+@@ -112,9 +112,7 @@
|
|
|
+ static void cleanup_pidfile(char *);
|
|
|
+ static void cleanup_sock(char *);
|
|
|
static int mg_setreply(SMFICTX *, struct mlfi_priv *, char *);
|
|
|
-#ifndef USE_POSTFIX
|
|
|
static char *local_ipstr(struct mlfi_priv *);
|
|
|
@@ -68,7 +80,7 @@ Index: milter-greylist.c
|
|
|
static sfsistat real_connect(SMFICTX *, char *, _SOCK_ADDR *);
|
|
|
static sfsistat real_helo(SMFICTX *, char *);
|
|
|
static sfsistat real_envfrom(SMFICTX *, char **);
|
|
|
-@@ -649,6 +647,10 @@
|
|
|
+@@ -620,6 +618,10 @@
|
|
|
len = strlen(name) + strlen(sep) + strlen(value) + strlen(crlf);
|
|
|
priv->priv_msgcount += len;
|
|
|
|
|
|
@@ -77,9 +89,9 @@ Index: milter-greylist.c
|
|
|
+ priv->priv_queueid = "(unknown id)";
|
|
|
+
|
|
|
if (priv->priv_msgcount > conf.c_maxpeek) {
|
|
|
- mg_log(LOG_DEBUG, "ignoring message beyond maxpeek = %d",
|
|
|
- conf.c_maxpeek);
|
|
|
-@@ -1452,6 +1454,9 @@
|
|
|
+ if (conf.c_debug)
|
|
|
+ mg_log(LOG_DEBUG,
|
|
|
+@@ -1415,6 +1417,9 @@
|
|
|
* Here we go!
|
|
|
*/
|
|
|
conf_release();
|
|
|
@@ -89,7 +101,7 @@ Index: milter-greylist.c
|
|
|
exitval = smfi_main();
|
|
|
mg_log(LOG_ERR, "smfi_main() returned %d", exitval);
|
|
|
|
|
|
-@@ -2443,15 +2448,9 @@
|
|
|
+@@ -2438,15 +2443,9 @@
|
|
|
}
|
|
|
|
|
|
snprintf(output, HDRLEN,
|
|
|
@@ -105,7 +117,7 @@ Index: milter-greylist.c
|
|
|
timestr, tzstr, tznamestr);
|
|
|
mystrncat(&outstr, output, &outmaxlen);
|
|
|
break;
|
|
|
-@@ -2791,7 +2790,6 @@
|
|
|
+@@ -2793,7 +2792,6 @@
|
|
|
return fstring;
|
|
|
}
|
|
|
|
|
|
@@ -113,7 +125,7 @@ Index: milter-greylist.c
|
|
|
static char *
|
|
|
local_ipstr(priv)
|
|
|
struct mlfi_priv *priv;
|
|
|
-@@ -2802,6 +2800,8 @@
|
|
|
+@@ -2804,6 +2802,8 @@
|
|
|
* Macro {if_addr} does not exist in Postfix
|
|
|
*/
|
|
|
ip = smfi_getsymval(priv->priv_ctx, "{if_addr}");
|
|
|
@@ -122,7 +134,7 @@ Index: milter-greylist.c
|
|
|
#ifdef AF_INET6
|
|
|
/*
|
|
|
* XXX: sendmail doesn't return {if_addr} when connection is
|
|
|
-@@ -2823,7 +2823,6 @@
|
|
|
+@@ -2825,7 +2825,6 @@
|
|
|
|
|
|
return ip;
|
|
|
}
|
|
|
@@ -131,8 +143,8 @@ Index: milter-greylist.c
|
|
|
static void
|
|
|
set_sr_defaults(priv, code, ecode, msg)
|
|
|
Index: milter-greylist.h
|
|
|
---- milter-greylist.h.orig 2007-02-05 07:05:34 +0100
|
|
|
-+++ milter-greylist.h 2007-03-02 10:28:33 +0100
|
|
|
+--- milter-greylist.h.orig 2007-05-02 05:36:50 +0200
|
|
|
++++ milter-greylist.h 2007-05-05 09:35:39 +0200
|
|
|
@@ -37,7 +37,7 @@
|
|
|
#include <arpa/inet.h>
|
|
|
#include <netdb.h>
|
|
|
@@ -143,8 +155,8 @@ Index: milter-greylist.h
|
|
|
#include "dump.h"
|
|
|
|
|
|
Index: stat.c
|
|
|
---- stat.c.orig 2007-01-01 18:29:29 +0100
|
|
|
-+++ stat.c 2007-03-02 10:28:46 +0100
|
|
|
+--- stat.c.orig 2007-02-21 22:46:36 +0100
|
|
|
++++ stat.c 2007-05-05 09:35:39 +0200
|
|
|
@@ -52,7 +52,7 @@
|
|
|
#include <sys/queue.h>
|
|
|
#endif
|
