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 d7bd402de868f2352e71b8ba91331c43c868da91..a1049537c3a446e08dab5383db92cbf39bde743f 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -1,8 +1,21 @@
 /*
- * $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 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.
+ *
+ * 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
  */
 
 #include "sysdep.h"
@@ -11,6 +24,7 @@
 #include <string.h>
 #include <netinet/in.h>
 #include <stdio.h>
+#include <syslog.h>
 
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
@@ -19,12 +33,11 @@
 #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"
 
 
@@ -103,9 +116,6 @@ int getmx(char *mxbuf, char *dest) {
                        u_char bytes[1024];
                        HEADER header;
     } answer;
-#else
-       char buf[SIZ];
-       FILE *fp;
 #endif
 
        int ret;
@@ -126,24 +136,7 @@ int getmx(char *mxbuf, char *dest) {
 
        /*
         * No smart-host?  Look up the best MX for a site.
-        */
-
-#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.
+        * Make a call to the resolver library.
         */
 
        ret = res_query(
@@ -168,7 +161,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);
                        }
                }
@@ -217,7 +210,6 @@ int getmx(char *mxbuf, char *dest) {
                        }
                }
        }
-#endif /* HAVE_RESOLV_H */
 
        /* Sort the MX records by preference */
        if (num_mxrecs > 1) {
@@ -230,5 +222,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);
 }