X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdomain.c;h=0e6bb7dabee767a61a70995ab9b3724f8eee9a8d;hb=aa7365c86de8e26e796d3aa3fd605c85d8c26220;hp=304cf0ef846d9fc63ba9f863e05adf3c03bc20dd;hpb=4eb74b26380dfde31c86c685f0589e0c653aebf0;p=citadel.git

diff --git a/citadel/domain.c b/citadel/domain.c
index 304cf0ef8..0e6bb7dab 100644
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -1,24 +1,15 @@
 /*
- * $Id$
- *
  * DNS lookup for SMTP sender
  *
+ * Copyright (c) 1987-2011 by the citadel.org team
  *
- * Copyright (c) 1987-2009 by the citadel.org team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  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.
+ * 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.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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"
@@ -27,6 +18,7 @@
 #include <string.h>
 #include <netinet/in.h>
 #include <stdio.h>
+#include <syslog.h>
 
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
@@ -163,7 +155,7 @@ int getmx(char *mxbuf, char *dest) {
 	
 		for (qdcount = ntohs(answer.header.qdcount); qdcount--; ptr += ret + QFIXEDSZ) {
 			if ((ret = dn_skipname(ptr, endptr)) < 0) {
-				CtdlLogPrintf(CTDL_DEBUG, "dn_skipname error\n");
+				syslog(LOG_DEBUG, "dn_skipname error\n");
 				return(0);
 			}
 		}
@@ -224,5 +216,9 @@ int getmx(char *mxbuf, char *dest) {
 		strcat(mxbuf, "|");
 	}
 	free(mxrecs);
+
+	/* Append any fallback smart hosts we have configured.
+	 */
+	num_mxrecs += get_hosts(&mxbuf[strlen(mxbuf)], "fallbackhost");
 	return(num_mxrecs);
 }