X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mxget.c;h=4529c223bea99e1abc838837d7dc88f8907df295;hb=6463caede766da351104ef421c0bcea52d4c4ba7;hp=64e88f7828c581867536db0c5c0e876ffeb629ae;hpb=e05fd1d8a7e5588008469746383f9e71bd1cbbfe;p=~andy%2Ffetchmail

diff --git a/mxget.c b/mxget.c
index 64e88f78..4529c223 100644
--- a/mxget.c
+++ b/mxget.c
@@ -1,19 +1,34 @@
 /*
  * mxget.c -- fetch MX records for given DNS name
  *
- * Copyright 1997 by Eric S. Raymond
+ * Copyright (C) 1996, 1997, 1998, 2000, 2002 by Eric S. Raymond
+ * Copyright (C) 2005, 2006, 2007 by Matthias Andree
  * For license terms, see the file COPYING in this directory.
  */
 
 #include "config.h"
-#ifdef HAVE_RES_SEARCH
+#include "fetchmail.h"
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_RES_SEARCH
+#ifdef HAVE_NET_SOCKET_H
+#include <net/socket.h>
+#endif
 #include <netdb.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+
+#ifdef __BEOS__
+#include "beos/beos_nameser.h"
+#endif
+
+#ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
 #include <resolv.h>
+#endif
+
 #include "mx.h"
 
 /*
@@ -55,13 +70,15 @@ struct mxentry *getmxrecords(const char *name)
     n = res_search(name, C_IN,T_MX, (unsigned char *)&answer, sizeof(answer));
     if (n == -1)
 	return((struct mxentry *)NULL);
+    if ((size_t)n > sizeof(answer))
+	n = sizeof(answer);    	
 
     hp = (HEADER *)&answer;
     cp = answer + HFIXEDSZ;
     eom = answer + n;
     h_errno = 0;
     for (qdcount = ntohs(hp->qdcount); qdcount--; cp += n + QFIXEDSZ)
-	if ((n = dn_skipname(cp, eom)) < 0)
+      if ((n = dn_skipname((unsigned char *)cp, (unsigned char *)eom)) < 0)
 	    return((struct mxentry *)NULL);
     buflen = sizeof(MXHostBuf) - 1;
     bp = MXHostBuf;
@@ -69,7 +86,8 @@ struct mxentry *getmxrecords(const char *name)
     ancount = ntohs(hp->ancount);
     while (--ancount >= 0 && cp < eom)
     {
-	if ((n = dn_expand(answer, eom, cp, bp, buflen)) < 0)
+	if ((n = dn_expand((unsigned char *)answer, (unsigned char *)eom,
+			   (unsigned char *)cp, bp, buflen)) < 0)
 	    break;
 	cp += n;
 	GETSHORT(type, cp);
@@ -81,7 +99,8 @@ struct mxentry *getmxrecords(const char *name)
 	    continue;
 	}
 	GETSHORT(pref, cp);
-	if ((n = dn_expand(answer, eom, cp, bp, buflen)) < 0)
+	if ((n = dn_expand((unsigned char *)answer, (unsigned char *)eom,
+			   (unsigned char *)cp, bp, buflen)) < 0)
 	    break;
 	cp += n;
 
@@ -102,20 +121,34 @@ struct mxentry *getmxrecords(const char *name)
 }
 #endif /* HAVE_RES_SEARCH */
 
-#ifdef TESTMAIN
-main(int argc, char *argv[])
+#ifdef STANDALONE
+#include <stdlib.h>
+
+int main(int argc, char *argv[])
 {
-    int	count, i;
+#ifdef HAVE_RES_SEARCH
     struct mxentry *responses;
+#endif
+
+    if (argc != 2 || 0 == strcmp(argv[1], "-h")) {
+	fprintf(stderr, "Usage: %s domain\n", argv[0]);
+	exit(1);
+    }
 
+#ifdef HAVE_RES_SEARCH
     responses = getmxrecords(argv[1]);
-    if (responses == (struct mxentry *)NULL)
+    if (responses == (struct mxentry *)NULL) {
 	puts("No MX records found");
-    else
+    } else {
 	do {
 	    printf("%s %d\n", responses->name, responses->pref);
-	} while
-	    ((++responses)->name);
+	} while ((++responses)->name);
+    }
+#else
+    puts("This program was compiled without HAS_RES_SEARCH and does nothing.");
+#endif
+
+    return 0;
 }
 #endif /* TESTMAIN */