Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / domain.c

diff --git a/citadel/domain.c b/citadel/domain.c
index fda55e86e2f98d0dd0066d63412e96460b97cb7d..3d055c671a55e7d53be9c9cc2e6d631d5a150607 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -1,17 +1,20 @@
 /*
- * $Id$
- *
  * DNS lookup for SMTP sender
  *
+ * Copyright (c) 1987-2011 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
@@ -23,7 +26,6 @@
 #include "sysdep_decls.h"
 #include "citadel.h"
 #include "domain.h"
-#include "server.h"
 #include "internet_addressing.h"
 
 
@@ -147,7 +149,7 @@ int getmx(char *mxbuf, char *dest) {
        
                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, "dn_skipname error\n");
                                return(0);
                        }
                }
@@ -208,5 +210,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);
 }