[Raw Msg Headers][Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

2.99.53 compile problem



Hi,

I found a compile problem on my system (still using the BIND 4 resolver
in libc). The following patch should resolve these. (It compiled. But I
haven't tried running the resulting ZMailer yet.)

--- zmailer-2.99.53/scheduler/transport.c.dist	Mon Jun 19 13:36:07 2000
+++ zmailer-2.99.53/scheduler/transport.c	Thu Aug 17 01:14:39 2000
@@ -28,6 +28,7 @@
 #include <sys/resource.h>
 #endif
 #ifdef HAVE_SYS_UN_H
+#include <sys/socket.h> /* Linux 2.2.16 + libc5 */
 #include <sys/un.h>
 #endif
 
--- zmailer-2.99.53/transports/smtp/smtp.c.dist	Tue Jul 11 09:46:05 2000
+++ zmailer-2.99.53/transports/smtp/smtp.c	Thu Aug 17 01:50:09 2000
@@ -4224,9 +4224,17 @@
 	arcount = ntohs(hp->arcount);
 
 	if (SS->verboselog)
-	  fprintf(SS->verboselog, "DNS lookup reply: len=%d rcode=%d qdcount=%d ancount=%d nscount=%d arcount=%d RD=%d TC=%d AA=%d QR=%d CD=%d AD=%d RA=%d\n",
+	  fprintf(SS->verboselog, "DNS lookup reply: len=%d rcode=%d qdcount=%d ancount=%d nscount=%d arcount=%d RD=%d TC=%d AA=%d QR=%d "
+#ifdef HAS_HEADER_CD_AD
+		  "CD=%d AD=%d "
+#endif
+	  	  "RA=%d\n",
 		  n, hp->rcode, qdcount, ancount, nscount, arcount,
-		  hp->rd, hp->tc, hp->aa, hp->qr, hp->cd, hp->ad, hp->ra);
+		  hp->rd, hp->tc, hp->aa, hp->qr,
+#ifdef HAS_HEADER_CD_AD
+		  hp->cd, hp->ad,
+#endif
+		  hp->ra);
 
 	if (hp->rcode != NOERROR || ancount == 0) {
 	  switch (hp->rcode) {
--- zmailer-2.99.53/configure.in.dist	Fri Jul 14 08:12:20 2000
+++ zmailer-2.99.53/configure.in	Thu Aug 17 02:26:05 2000
@@ -22,9 +22,9 @@
 # Parts from other sources long forgotten, and many
 # new things invented by myself...
 #
-# ZMailer is almoast as versatile systems feature tester as
+# ZMailer is almost as a versatile systems feature tester as
 # the best (or worst) other beats, like  SSH ...   About the
-# only thing that ZMailer does not need are PTY allocation
+# only things that ZMailer does not need are PTY allocation
 # mechanisms ...
 #
 
@@ -1184,6 +1184,21 @@
     INCLRESOLV='-I$(TOPDIR)/libresolv'
     LIBRESOLVA="libresolv.a"
     AC_MSG_RESULT([Using bundled (bind 4.9.4-REL) libresolv])
+fi
+
+#
+# Test to see, if we have cd and ad fields in "struct HEADER"
+#
+AC_CACHE_CHECK(for cd and ad in HEADER struct (BIND 8),
+zm_cv_struct_HEADER_cd_ac,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>],
+[struct HEADER a; a.ad = a.cd = 0;],
+zm_cv_struct_HEADER_cd_ac=yes, zm_cv_struct_HEADER_cd_ac=no)])
+if test "$zm_cv_struct_HEADER_cd_ac" = yes; then
+	AC_DEFINE(HAVE_HEADER_CD_AD)
 fi
 
 #
--- zmailer-2.99.53/config.h.in.dist	Tue Jun 20 08:25:25 2000
+++ zmailer-2.99.53/config.h.in	Thu Aug 17 01:57:07 2000
@@ -213,6 +213,9 @@
 /* Defined if socket structure has  sa_len  field */
 #undef HAVE_SA_LEN
 
+/* Defined if HEADER structure has  cd  and  ad  fields */
+#undef HAVE_HEADER_CD_AD
+
 /* Doing email spool locking with "dot-lock" system */
 #undef HAVE_DOTLOCK
 

-- 
Ambrose Li  <ai337@freenet.toronto.on.ca>  http://trends.ca/~acli/
                        Please visit http://www.cokespotlight.org
                    "A good style should show no sign of effort;
what is written should seem a happy accident." -- Somerset Maugham.