Fixed a bug in the startup sanity checks. When it had to make a fix it was trying...

[citadel.git] / citadel / domain.c

diff --git a/citadel/domain.c b/citadel/domain.c
index 4f723134b0efdc61c95e8d7921a761361ecace7f..25a4d7afc1a22ebe509a170336283f1a7813918b 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -1,33 +1,20 @@
 /*
- * $Id$
- *
  * DNS lookup for SMTP sender
  *
+ * Copyright (c) 1987-2021 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"
-#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"
 
 
@@ -129,21 +115,21 @@ 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.
         */
 
-       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 = malloc(sizeof(struct mx));
@@ -152,30 +138,26 @@ int getmx(char *mxbuf, char *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) {
-                               CtdlLogPrintf(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;
        
@@ -183,18 +165,14 @@ 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;
@@ -202,13 +180,11 @@ int getmx(char *mxbuf, char *dest) {
                                        mxrecs = malloc(sizeof(struct mx));
                                }
                                else {
-                                       mxrecs = realloc(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);
                        }
                }
        }
@@ -220,12 +196,14 @@ 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, "|");
        }
        free(mxrecs);
 
-       /* Append any fallback smart hosts we have configured.
+       /*
+        * Append any fallback smart hosts we have configured.
         */
        num_mxrecs += get_hosts(&mxbuf[strlen(mxbuf)], "fallbackhost");
        return(num_mxrecs);