diff -urN ../tmp-orig/zmailer-2.99.56/lib/sleepycatdb.c ./lib/sleepycatdb.c
--- ../tmp-orig/zmailer-2.99.56/lib/sleepycatdb.c 2003-05-09 09:43:22.000000000 +0200
+++ ./lib/sleepycatdb.c 2005-01-09 12:29:46.617927976 +0100
@@ -295,7 +295,7 @@
err = db_create(&db, prv->ZSE ? prv->ZSE->env : NULL, 0);
if (err == 0 && db != NULL) {
err = db->open( db,
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 1)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)
NULL, /* TXN id was added at SleepyDB 4.1 */
#endif
prv->filename, NULL, prv->dbtype,
diff -urN ../tmp-orig/zmailer-2.99.56/scheduler/prototypes.h ./scheduler/prototypes.h
--- ../tmp-orig/zmailer-2.99.56/scheduler/prototypes.h 2003-09-25 23:21:13.000000000 +0200
+++ ./scheduler/prototypes.h 2005-01-09 12:31:32.954762320 +0100
@@ -39,7 +39,6 @@
extern u_int ranny __((u_int m));
/* agenda.c */
-extern time_t qipcretry;
extern int doagenda __((void));
extern int doexpiry2 __((void));
extern int turnme __((const char *));
diff -urN ../tmp-orig/zmailer-2.99.56/smtpserver/policytest.c ./smtpserver/policytest.c
--- ../tmp-orig/zmailer-2.99.56/smtpserver/policytest.c 2003-11-11 13:54:03.000000000 +0100
+++ ./smtpserver/policytest.c 2005-01-09 12:30:50.213260016 +0100
@@ -691,7 +691,7 @@
openok = db_create(&rel->btree, NULL, 0);
if (openok == 0)
openok = rel->btree->open(rel->btree,
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 1)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)
NULL, /* TXN id was added at SleepyDB 4.1 */
#endif
dbname, NULL, DB_BTREE,
@@ -727,7 +727,7 @@
openok = db_create(&rel->bhash, NULL, 0);
if (openok == 0)
openok = rel->bhash->open(rel->bhash,
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 1)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)
NULL, /* TXN id was added at SleepyDB 4.1 */
#endif
dbname, NULL, DB_HASH,
diff -urN ../tmp-orig/zmailer-2.99.56/transports/libta/dnsgetrr.c ./transports/libta/dnsgetrr.c
--- ../tmp-orig/zmailer-2.99.56/transports/libta/dnsgetrr.c 2003-05-06 22:27:46.000000000 +0200
+++ ./transports/libta/dnsgetrr.c 2005-01-09 12:28:59.618073040 +0100
@@ -197,8 +197,8 @@
gethostbyname2() routines from BIND 4.9.4 -- "slighly" by adding
a state block into parameters, and thus removing blind static arrays. */
-static int res_hnok(cp)const char *cp;{return 1;}
-static int res_dnok(cp)const char *cp;{return 1;}
+static int res_hnok_local(cp)const char *cp;{return 1;}
+static int res_dnok_local(cp)const char *cp;{return 1;}
static const char AskedForGot[] =
"gethostby*.getanswer_r: asked for \"%s\", got \"%s\"";
@@ -281,10 +281,10 @@
switch (qtype) {
case T_A:
case T_AAAA:
- name_ok = res_hnok;
+ name_ok = res_hnok_local;
break;
case T_PTR:
- name_ok = res_dnok;
+ name_ok = res_dnok_local;
break;
default:
return (NULL); /* XXX should be abort(); */
@@ -373,7 +373,7 @@
}
if (qtype == T_PTR && type == T_CNAME) {
n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
- if ((n < 0) || !res_hnok(tbuf)) {
+ if ((n < 0) || !res_hnok_local(tbuf)) {
had_error++;
continue;
}
@@ -411,7 +411,7 @@
continue; /* XXX - had_error++ ? */
}
n = dn_expand(answer->buf, eom, cp, bp, buflen);
- if ((n < 0) || !res_hnok(bp)) {
+ if ((n < 0) || !res_hnok_local(bp)) {
had_error++;
break;
}
diff -urN ../tmp-orig/zmailer-2.99.56/utils/makedb/dblook.c ./utils/makedb/dblook.c
--- ../tmp-orig/zmailer-2.99.56/utils/makedb/dblook.c 2003-05-09 09:52:17.000000000 +0200
+++ ./utils/makedb/dblook.c 2005-01-09 12:32:41.348364912 +0100
@@ -273,7 +273,7 @@
rc = db_create(&dbfile, NULL, 0);
if (rc == 0)
rc = dbfile->open(dbfile,
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 1)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)
NULL, /* TXN id was added at SleepyDB 4.1 */
#endif
dbasename, NULL, DB_BTREE,
@@ -330,7 +330,7 @@
rc = db_create(&dbfile, NULL, 0);
if (rc == 0)
rc = dbfile->open(dbfile,
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 1)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)
NULL, /* TXN id was added at SleepyDB 4.1 */
#endif
dbasename, NULL, DB_HASH,
diff -urN ../tmp-orig/zmailer-2.99.56/utils/makedb/makedb.c ./utils/makedb/makedb.c
--- ../tmp-orig/zmailer-2.99.56/utils/makedb/makedb.c 2003-11-06 18:10:23.000000000 +0100
+++ ./utils/makedb/makedb.c 2005-01-09 12:32:23.745041024 +0100
@@ -910,7 +910,7 @@
err = db_create(&dbfile, NULL, 0);
if (! err)
err = dbfile->open(dbfile,
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 1)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)
NULL, /* TXN id was added at SleepyDB 4.1 */
#endif
dbasename, NULL, DB_BTREE,
@@ -928,7 +928,7 @@
err = db_create(&dbfile, NULL, 0);
if (! err)
err = dbfile->open(dbfile,
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 1)
+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)
NULL, /* TXN id was added at SleepyDB 4.1 */
#endif
dbasename, NULL, DB_HASH,
