X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdomain.c;h=25a4d7afc1a22ebe509a170336283f1a7813918b;hb=36908e5d8ca8ad1207d7f8466c0858c71c9588b4;hp=8af3bc37b573c699f43b941e0ac62e277507d0b5;hpb=2e5bfef2c1708874507a51c9469b2c181b5523f4;p=citadel.git

diff --git a/citadel/domain.c b/citadel/domain.c
index 8af3bc37b..25a4d7afc 100644
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -1,17 +1,20 @@
 /*
- * $Id$
- *
  * DNS lookup for SMTP sender
  *
+ * Copyright (c) 1987-2021 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <netinet/in.h>
 #include <stdio.h>
-
+#include <syslog.h>
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
 #ifdef HAVE_ARPA_NAMESER_COMPAT_H
@@ -19,12 +22,10 @@
 #endif
 #include <resolv.h>
 #endif
-
+#include <libcitadel.h>
 #include "sysdep_decls.h"
 #include "citadel.h"
 #include "domain.h"
-#include "server.h"
-#include "tools.h"
 #include "internet_addressing.h"
 
 
@@ -38,8 +39,8 @@
 int get_hosts(char *mxbuf, char *rectype) {
 	int config_lines;
 	int i;
-	char buf[SIZ];
-	char host[SIZ], type[SIZ];
+	char buf[256];
+	char host[256], type[256];
 	int total_smarthosts = 0;
 
 	if (inetcfg == NULL) return(0);
@@ -47,9 +48,9 @@ int get_hosts(char *mxbuf, char *rectype) {
 
 	config_lines = num_tokens(inetcfg, '\n');
 	for (i=0; i<config_lines; ++i) {
-		extract_token(buf, inetcfg, i, '\n');
-		extract_token(host, buf, 0, '|');
-		extract_token(type, buf, 1, '|');
+		extract_token(buf, inetcfg, i, '\n', sizeof buf);
+		extract_token(host, buf, 0, '|', sizeof host);
+		extract_token(type, buf, 1, '|', sizeof type);
 
 		if (!strcasecmp(type, rectype)) {
 			strcat(mxbuf, host);
@@ -103,9 +104,6 @@ int getmx(char *mxbuf, char *dest) {
 			u_char bytes[1024];
 			HEADER header;
     } answer;
-#else
-	char buf[SIZ];
-	FILE *fp;
 #endif
 
 	int ret;
@@ -117,70 +115,49 @@ int getmx(char *mxbuf, char *dest) {
 
 	struct mx *mxrecs = NULL;
 	int num_mxrecs = 0;
-	
+
 	/* If we're configured to send all mail to a smart-host, then our
 	 * job here is really easy.
 	 */
 	n = get_hosts(mxbuf, "smarthost");
-	if (n > 0) return(n);
+	if (n > 0) {
+		return(n);
+	}
 
 	/*
 	 * No smart-host?  Look up the best MX for a site.
+	 * Make a call to the resolver library.
 	 */
 
-#ifndef HAVE_RESOLV_H
-
-	/*
-	 * On systems with b0rken or non-standard resolver libraries, learn
-	 * the MX records by calling "nslookup" from the command line.
-	 *
-	 * Someday.
-	 *
-	 */
-
-	return(0);
-
-#else /* HAVE_RESOLV_H */
-
-	/*
-	 * Make a call to the standard resolver library.
-	 */
-
-	ret = res_query(
-		dest,
-		C_IN, T_MX, (unsigned char *)answer.bytes, sizeof(answer)  );
+	ret = res_query(dest, C_IN, T_MX, (unsigned char *)answer.bytes, sizeof(answer));
 
 	if (ret < 0) {
-		mxrecs = mallok(sizeof(struct mx));
+		mxrecs = malloc(sizeof(struct mx));
 		mxrecs[0].pref = 0;
 		strcpy(mxrecs[0].host, dest);
 		num_mxrecs = 1;
 	}
 	else {
-
 		/* If we had to truncate, shrink the number to avoid fireworks */
-		if (ret > sizeof(answer))
+		if (ret > sizeof(answer)) {
 			ret = sizeof(answer);
+		}
 	
-		startptr = &answer.bytes[0];		/* start and end of buffer */
+		startptr = &answer.bytes[0];		// start and end of buffer
 		endptr = &answer.bytes[ret];
-		ptr = startptr + HFIXEDSZ;	/* advance past header */
+		ptr = startptr + HFIXEDSZ;		// advance past header
 	
 		for (qdcount = ntohs(answer.header.qdcount); qdcount--; ptr += ret + QFIXEDSZ) {
 			if ((ret = dn_skipname(ptr, endptr)) < 0) {
-				lprintf(CTDL_DEBUG, "dn_skipname error\n");
+				syslog(LOG_DEBUG, "domain: dn_skipname error");
 				return(0);
 			}
 		}
 	
 		while(1) {
+			TRACE;
 			memset(expanded_buf, 0, sizeof(expanded_buf));
-			ret = dn_expand(startptr,
-					endptr,
-					ptr,
-					expanded_buf,
-					sizeof(expanded_buf)
-					);
+			ret = dn_expand(startptr, endptr, ptr, expanded_buf, sizeof(expanded_buf));
 			if (ret < 0) break;
 			ptr += ret;
 	
@@ -188,36 +165,29 @@ int getmx(char *mxbuf, char *dest) {
 			ptr += INT16SZ + INT32SZ;
 			GETSHORT(n, ptr);
 	
+			syslog(LOG_DEBUG, "\033[35mgetmx: found record of type %d and length %d\033[0m", type, n);
 			if (type != T_MX) {
 				ptr += n;
 			}
 	
 			else {
 				GETSHORT(pref, ptr);
-				ret = dn_expand(startptr,
-						endptr,
-						ptr,
-						expanded_buf,
-						sizeof(expanded_buf)
-						);
+				ret = dn_expand(startptr, endptr, ptr, expanded_buf, sizeof(expanded_buf));
 				ptr += ret;
 	
 				++num_mxrecs;
 				if (mxrecs == NULL) {
-					mxrecs = mallok(sizeof(struct mx));
+					mxrecs = malloc(sizeof(struct mx));
 				}
 				else {
-					mxrecs = reallok(mxrecs,
-					    (sizeof(struct mx) * num_mxrecs) );
+					mxrecs = realloc(mxrecs, (sizeof(struct mx) * num_mxrecs) );
 				}
 	
 				mxrecs[num_mxrecs - 1].pref = pref;
-				strcpy(mxrecs[num_mxrecs - 1].host,
-				       expanded_buf);
+				strcpy(mxrecs[num_mxrecs - 1].host, expanded_buf);
 			}
 		}
 	}
-#endif /* HAVE_RESOLV_H */
 
 	/* Sort the MX records by preference */
 	if (num_mxrecs > 1) {
@@ -226,9 +196,15 @@ int getmx(char *mxbuf, char *dest) {
 
 	strcpy(mxbuf, "");
 	for (n=0; n<num_mxrecs; ++n) {
+		syslog(LOG_DEBUG, "\033[35mgetmx: %d : <%s>\033[0m", n, mxrecs[n].host);
 		strcat(mxbuf, mxrecs[n].host);
 		strcat(mxbuf, "|");
 	}
-	phree(mxrecs);
+	free(mxrecs);
+
+	/*
+	 * Append any fallback smart hosts we have configured.
+	 */
+	num_mxrecs += get_hosts(&mxbuf[strlen(mxbuf)], "fallbackhost");
 	return(num_mxrecs);
 }