/*
- * $Id$
- *
* Functions which handle hostname/address lookups and resolution
*
+ * 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"
#include <netdb.h>
#include <string.h>
#include <errno.h>
+#include <syslog.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include <resolv.h>
#endif
+/** START:some missing macros on OpenBSD 3.9 */
+#ifndef NS_CMPRSFLGS
+#define NS_CMPRSFLGS 0xc0
+#endif
+#if !defined(NS_MAXCDNAME) && defined (MAXCDNAME)
+#define NS_MAXCDNAME MAXCDNAME
+#endif
+#if !defined(NS_INT16SZ) && defined(INT16SZ)
+#define NS_INT16SZ INT16SZ
+#define NS_INT32SZ INT32SZ
+#endif
+#ifndef NS_GET16
+# define NS_GET16 GETSHORT
+#endif
+
+/** END:some missing macros on OpenBSD 3.9 */
/*
* Given an open client socket, return the host name and IP address at the other end.
* as dotted-quad, even if they come in over a hybrid IPv6/IPv4 socket.
*/
if ( (strlen(abuf) > 7) && (!strncasecmp(abuf, "::ffff:", 7)) ) {
+ if (!strcmp(abuf, tbuf)) strcpy(tbuf, &tbuf[7]);
strcpy(abuf, &abuf[7]);
}
}
/* Make our DNS query. */
answer = fixedans;
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize, "System shutting down");
if( len == -1 ) {
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize,
- "Message rejected due to known spammer source IP address");
+ "Message rejected due to known spammer source IP address");
}
if (need_to_free_answer) free(answer);
return(1);
}
}
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
if (txtbuf != NULL)
snprintf(txtbuf, txtbufsize, "System shutting down");
* nameserver we're using.
*/
len = res_query(domain, C_IN, T_TXT, answer, PACKETSZ);
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize, "System shutting down");
{
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize,
- "Message rejected due to known spammer source IP address");
+ "Message rejected due to known spammer source IP address");
}
if (need_to_free_answer) free(answer);
free(result);
}
*rp = '\0';
if (txtbuf != NULL) {
- snprintf(txtbuf, txtbufsize, "%s", result);
- }
- /* Remove nonprintable characters */
- for (p=txtbuf; *p; ++p) {
- if (!isprint(*p)) strcpy(p, p+1);
+ long len;
+ len = snprintf(txtbuf, txtbufsize, "%s", result);
+
+ /* Remove nonprintable characters */
+ for (p = txtbuf; *p != '\0'; p++) {
+ if (!isprint(*p)) {
+ memmove (p,
+ p + 1,
+ len - (p - txtbuf) - 1);
+ }
+ }
}
if (need_to_free_answer) free(answer);
free(result);
int num_rbl;
char rbl_domains[SIZ];
char txt_answer[1024];
- int ip_version = 4;
strcpy(message_to_spammer, "ok");
if ((strchr(CC->cs_addr, '.')) && (!strchr(CC->cs_addr, ':'))) {
int a1, a2, a3, a4;
- ip_version = 4;
sscanf(CC->cs_addr, "%d.%d.%d.%d", &a1, &a2, &a3, &a4);
snprintf(tbuf, sizeof tbuf, "%d.%d.%d.%d.", a4, a3, a2, a1);
char workbuf[sizeof tbuf];
char *ptr;
- ip_version = 6;
-
/* tedious code to expand and reverse an IPv6 address */
safestrncpy(tbuf, CC->cs_addr, sizeof tbuf);
num_colons = haschar(tbuf, ':');
if (rblcheck_backend(tbuf, txt_answer, sizeof txt_answer)) {
strcpy(message_to_spammer, txt_answer);
- CtdlLogPrintf(CTDL_INFO, "RBL: %s\n", txt_answer);
+ syslog(LOG_INFO, "RBL: %s\n", txt_answer);
return(1);
}
}