2.99.56pre4 (not false report)

[Ambrose Li <acli@ada.dhs.org>]

Hi,

this should not be a false report this time.

1. I found that db 2.7.5 does not have db_strerror(), so a couple of
   lines in the router/libdb directory did not compile for me (with
   db 2.7.5). Patch is below.

2. README.UPGRADING mentions about a change in the interface between
   the smtpserver and the content-filter. Is there a way for the
   content filter to detect the version of the interface (e.g., is
   there an environment variable it can check)?


------------- cut here ------------- 8< ---------------------------
--- ./router/libdb/bsdbtree.c.dist	Thu Feb 13 15:45:33 2003
+++ ./router/libdb/bsdbtree.c	Tue Jun 10 00:53:53 2003
@@ -128,7 +128,7 @@
 	    struct stat stbuf;
 	    int fd = -1, err = 0;
 
-#if defined(HAVE_DB2) || defined(HAVE_DB3) || defined(HAVE_DB4)
+#if defined(HAVE_DB3) || defined(HAVE_DB4)
 	    err = (db->fd)(db, &fd);
 	    if (fstat(fd, &stbuf) < 0) {
 		fprintf(stderr, "open_btree: cannot fstat(\"%s\"(%d))!  err=%d/%s (%s/%s)\n",
@@ -142,9 +142,9 @@
 		return NULL;
 	    }
 #else
-	    fd = (db->fd)(db);
+	    fd = (db->fd)(db, &fd);
 	    if (fstat(fd, &stbuf) < 0) {
-		fprintf(stderr, "open_btree: cannot fstat(\"%s\"/%d))!  err=%d (%s)\n",
+		fprintf(stderr, "open_btree: cannot fstat(\"%s\"(%d))!  err=%d (%s)\n",
 			sip->file, fd, errno, strerror(errno));
 
 		SLEEPYCATDBCLOSE(db);
--- ./router/libdb/bsdhash.c.dist	Thu Feb 13 15:47:57 2003
+++ ./router/libdb/bsdhash.c	Tue Jun 10 00:54:52 2003
@@ -126,7 +126,7 @@
 	    struct stat stbuf;
 	    int fd = -1, err = 0;
 
-#if defined(HAVE_DB2) || defined(HAVE_DB3) || defined(HAVE_DB4)
+#if defined(HAVE_DB3) || defined(HAVE_DB4)
 	    err = (db->fd)(db, &fd);
 	    if (fstat(fd, &stbuf) < 0) {
 		fprintf(stderr, "open_bhash: cannot fstat(\"%s\"(%d))!  err=%d/%s (%s/%s)\n",
@@ -140,9 +140,9 @@
 		return NULL;
 	    }
 #else
-	    fd = (db->fd)(db);
+	    fd = (db->fd)(db, &fd);
 	    if (fstat(fd, &stbuf) < 0) {
-		fprintf(stderr, "open_bhash: cannot fstat(\"%s\"/%d))!  err=%d (%s)\n",
+		fprintf(stderr, "open_bhash: cannot fstat(\"%s\"(%d))!  err=%d (%s)\n",
 			sip->file, fd, errno, strerror(errno));
 
 		SLEEPYCATDBCLOSE(db);
------------- cut here ------------- 8< ---------------------------

Best regards,
-- 
Ambrose LI Cheuk-Wing  <a.c.li@ieee.org>

http://ada.dhs.org/~acli/
-
To unsubscribe from this list: send the line "unsubscribe zmailer" in
the body of a message to majordomo@nic.funet.fi