X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdomain.c;h=25a4d7afc1a22ebe509a170336283f1a7813918b;hb=36908e5d8ca8ad1207d7f8466c0858c71c9588b4;hp=ac47dcb7eaf6cbea3553a2507ee4c04001c84d3b;hpb=459cc01862c7b6c39a94bbde237a2ff07c21fa18;p=citadel.git diff --git a/citadel/domain.c b/citadel/domain.c index ac47dcb7e..25a4d7afc 100644 --- a/citadel/domain.c +++ b/citadel/domain.c @@ -1,27 +1,31 @@ /* - * $Id$ - * * DNS lookup for SMTP sender * + * Copyright (c) 1987-2021 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 -#include -#include -#include #include - +#include #ifdef HAVE_RESOLV_H #include +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +#include +#endif #include #endif - +#include #include "sysdep_decls.h" #include "citadel.h" #include "domain.h" -#include "server.h" -#include "tools.h" #include "internet_addressing.h" @@ -35,8 +39,8 @@ int get_hosts(char *mxbuf, char *rectype) { int config_lines; int i; - char buf[SIZ]; - char host[SIZ], type[SIZ]; + char buf[256]; + char host[256], type[256]; int total_smarthosts = 0; if (inetcfg == NULL) return(0); @@ -44,9 +48,9 @@ int get_hosts(char *mxbuf, char *rectype) { config_lines = num_tokens(inetcfg, '\n'); for (i=0; ipref; + pref2 = ((const struct mx *)mx2)->pref; + if (pref1 > pref2) { return(1); } @@ -77,33 +87,6 @@ inline int mx_compare_pref(int pref1, int pref2) { } -/* - * sort_mxrecs() - * - * Sort a pile of MX records (struct mx, definted in domain.h) by preference - * - */ -void sort_mxrecs(struct mx *mxrecs, int num_mxrecs) { - int a, b; - struct mx hold1, hold2; - - if (num_mxrecs < 2) return; - - /* do the sort */ - for (a = num_mxrecs - 2; a >= 0; --a) { - for (b = 0; b <= a; ++b) { - if (mx_compare_pref(mxrecs[b].pref,mxrecs[b+1].pref)) { - memcpy(&hold1, &mxrecs[b], sizeof(struct mx)); - memcpy(&hold2, &mxrecs[b+1], sizeof(struct mx)); - memcpy(&mxrecs[b], &hold2, sizeof(struct mx)); - memcpy(&mxrecs[b+1], &hold1, sizeof(struct mx)); - } - } - } -} - - - /* * getmx() * @@ -121,9 +104,6 @@ int getmx(char *mxbuf, char *dest) { u_char bytes[1024]; HEADER header; } answer; -#else - char buf[SIZ]; - FILE *fp; #endif int ret; @@ -135,75 +115,49 @@ 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); - - - /* - * 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. - */ - sprintf(buf, "nslookup -query=mx %s", dest); - fp = popen(buf, "r"); - if (fp == NULL) return(0); - while (fgets(buf, sizeof buf, fp) != NULL) { - buf[strlen(buf) - 1] = 0; - lprintf(9, "RESOLV: %s\n", buf); + if (n > 0) { + return(n); } - pclose(fp); - return(0); /* FIXME */ - -#else /* HAVE_RESOLV_H */ /* - * Make a call to the standard resolver library. + * 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 = mallok(sizeof(struct mx)); + mxrecs = malloc(sizeof(struct mx)); mxrecs[0].pref = 0; strcpy(mxrecs[0].host, 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) { - lprintf(9, "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; @@ -211,44 +165,46 @@ 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; if (mxrecs == NULL) { - mxrecs = mallok(sizeof(struct mx)); + mxrecs = malloc(sizeof(struct mx)); } else { - mxrecs = reallok(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); } } } -#endif /* HAVE_RESOLV_H */ - sort_mxrecs(mxrecs, num_mxrecs); + /* Sort the MX records by preference */ + if (num_mxrecs > 1) { + qsort(mxrecs, num_mxrecs, sizeof(struct mx), mx_compare_pref); + } strcpy(mxbuf, ""); for (n=0; n\033[0m", n, mxrecs[n].host); strcat(mxbuf, mxrecs[n].host); strcat(mxbuf, "|"); } - phree(mxrecs); + free(mxrecs); + + /* + * Append any fallback smart hosts we have configured. + */ + num_mxrecs += get_hosts(&mxbuf[strlen(mxbuf)], "fallbackhost"); return(num_mxrecs); }