doc/reference.conf: document the auth::umodes configuration option

[solanum.git] / ircd / dns.c

diff --git a/ircd/dns.c b/ircd/dns.c
index fa3c530a8b2a8983baad387274e792b4d6c09af0..20ce14800e5d94850aaaef0a53a812aabef08518 100644 (file)
--- a/ircd/dns.c
+++ b/ircd/dns.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2005 Aaron Sethman <androsyn@ratbox.org>
  *  Copyright (C) 2005-2012 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  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
@@ -36,6 +36,7 @@
 #include "numeric.h"
 #include "msg.h"
 #include "hash.h"
+#include "s_assert.h"
 
 #define DNS_HOST_IPV4          ((char)'4')
 #define DNS_HOST_IPV6          ((char)'6')
@@ -82,7 +83,7 @@ handle_dns_failure(uint32_t xid)
        struct dnsreq *req = rb_dictionary_retrieve(query_dict, RB_UINT_TO_POINTER(xid));
        s_assert(req);
 
-       if(req->callback == NULL)
+       if(req == NULL || req->callback == NULL)
                return;
 
        req->callback("FAILED", 0, 0, req->data);
@@ -96,7 +97,7 @@ handle_dns_stat_failure(uint32_t xid)
        struct dnsstatreq *req = rb_dictionary_retrieve(stat_dict, RB_UINT_TO_POINTER(xid));
        s_assert(req);
 
-       if(req->callback == NULL)
+       if(req == NULL || req->callback == NULL)
                return;
 
        req->callback(1, NULL, 2, req->data);
@@ -110,6 +111,10 @@ cancel_lookup(uint32_t xid)
 {
        struct dnsreq *req = rb_dictionary_retrieve(query_dict, RB_UINT_TO_POINTER(xid));
        s_assert(req);
+
+       if (req == NULL)
+               return;
+
        req->callback = NULL;
        req->data = NULL;
 }
@@ -119,6 +124,10 @@ cancel_dns_stats(uint32_t xid)
 {
        struct dnsstatreq *req = rb_dictionary_retrieve(stat_dict, RB_UINT_TO_POINTER(xid));
        s_assert(req);
+
+       if (req == NULL)
+               return;
+
        req->callback = NULL;
        req->data = NULL;
 }
@@ -138,11 +147,9 @@ lookup_hostname(const char *hostname, int aftype, DNSCB callback, void *data)
        req->callback = callback;
        req->data = data;
 
-#ifdef RB_IPV6
        if(aftype == AF_INET6)
                aft = 6;
        else
-#endif
                aft = 4;
 
        submit_dns(rid, aft == 4 ? DNS_HOST_IPV4 : DNS_HOST_IPV6, hostname);
@@ -163,11 +170,9 @@ lookup_ip(const char *addr, int aftype, DNSCB callback, void *data)
        req->callback = callback;
        req->data = data;
 
-#ifdef RB_IPV6
        if(aftype == AF_INET6)
                aft = 6;
        else
-#endif
                aft = 4;
 
        submit_dns(rid, aft == 4 ? DNS_REVERSE_IPV4 : DNS_REVERSE_IPV6, addr);
@@ -217,11 +222,9 @@ dns_results_callback(const char *callid, const char *status, const char *type, c
                req->data = NULL;
                return;
        }
-#ifdef RB_IPV6
        if(aft == 6)
                aft = AF_INET6;
        else
-#endif
                aft = AF_INET;
 
        req->callback(results, st, aft, req->data);
@@ -245,6 +248,8 @@ dns_stats_results_callback(const char *callid, const char *status, int resc, con
        req = rb_dictionary_retrieve(stat_dict, RB_UINT_TO_POINTER(qid));
 
        s_assert(req);
+       if (req == NULL)
+               return;
 
        if(req->callback == NULL)
        {
@@ -292,7 +297,7 @@ stats_results_callback(int resc, const char *resv[], int status, void *data)
        }
        else
        {
-               const char *error = resc ? resv[resc] : "Unknown error";
+               const char *error = resc ? resv[resc - 1] : "Unknown error";
                iwarn("Error getting DNS servers: %s", error);
        }
 }