/*
- * $Id$
- *
* DNS lookup for SMTP sender
*
+ * Copyright (c) 1987-2017 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
#include "sysdep_decls.h"
#include "citadel.h"
#include "domain.h"
-#include "server.h"
#include "internet_addressing.h"
* 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));
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) {
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;
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;
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);
}
}
}
strcat(mxbuf, "|");
}
free(mxrecs);
+
+ /*
+ * Append any fallback smart hosts we have configured.
+ */
+ num_mxrecs += get_hosts(&mxbuf[strlen(mxbuf)], "fallbackhost");
return(num_mxrecs);
}