Implemented the range handling code for XOVER

[citadel.git] / citadel / domain.c

diff --git a/citadel/domain.c b/citadel/domain.c
index 7b862e97dba97d0e42b7a70388af1d5487402b0f..3d055c671a55e7d53be9c9cc2e6d631d5a150607 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -1,33 +1,20 @@
 /*
- * $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 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.
- *
- *  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"
-#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
@@ -39,7 +26,6 @@
 #include "sysdep_decls.h"
 #include "citadel.h"
 #include "domain.h"
-#include "server.h"
 #include "internet_addressing.h"
 
 
@@ -163,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) {
-                               CtdlLogPrintf(CTDL_DEBUG, "dn_skipname error\n");
+                               syslog(LOG_DEBUG, "dn_skipname error\n");
                                return(0);
                        }
                }
@@ -228,6 +214,5 @@ int getmx(char *mxbuf, char *dest) {
        /* Append any fallback smart hosts we have configured.
         */
        num_mxrecs += get_hosts(&mxbuf[strlen(mxbuf)], "fallbackhost");
-       CtdlLogPrintf(CTDL_DEBUG, "\033[33m%d: %s\033[0m\n", num_mxrecs, mxbuf);
        return(num_mxrecs);
 }