Merge pull request #341 from ophion-project/upstream/modularize-regonlymsg

[solanum.git] / ircd / dns.c

diff --git a/ircd/dns.c b/ircd/dns.c
index 5ee9b0c764ad8c7e3eb433cd609661e7c571f855..92cca073e50be246602b543459b19cd62132d8c6 100644 (file)
--- a/ircd/dns.c
+++ b/ircd/dns.c
@@ -147,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);
@@ -172,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);
@@ -226,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);
@@ -303,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);
        }
 }