Removal of ancient SVN ID's part one

[irc/rqf/shadowircd.git] / src / reslib.c

diff --git a/src/reslib.c b/src/reslib.c
index d2b029cfd308ae74022d0a141856eae495858371..25cabe4494bf3ed4bdbbb7207adff0e68965d8ed 100644 (file)
--- a/src/reslib.c
+++ b/src/reslib.c
@@ -86,19 +86,16 @@
 #include "ircd.h"
 #include "res.h"
 #include "reslib.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 
 #define NS_TYPE_ELT             0x40 /* EDNS0 extended label type */
 #define DNS_LABELTYPE_BITSTRING 0x41
 #define DNS_MAXLINE 128
 
-/* $Id: reslib.c 1695 2006-06-27 15:11:23Z jilles $ */
-/* from Hybrid Id: reslib.c 177 2005-10-22 09:05:05Z michael $ */
 
-struct irc_sockaddr_storage irc_nsaddr_list[IRCD_MAXNS];
+struct rb_sockaddr_storage irc_nsaddr_list[IRCD_MAXNS];
 int irc_nscount = 0;
-char irc_domain[HOSTLEN + 1];
+char irc_domain[IRCD_RES_HOSTLEN + 1];
 
 static const char digitvalue[256] = {
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*16*/
@@ -209,7 +206,7 @@ parse_resvconf(void)
       *p = '\0';  /* take the first word */
 
     if (irccmp(opt, "domain") == 0)
-      strlcpy(irc_domain, arg, sizeof(irc_domain));
+      rb_strlcpy(irc_domain, arg, sizeof(irc_domain));
     else if (irccmp(opt, "nameserver") == 0)
       add_nameserver(arg);
   }
@@ -409,7 +406,7 @@ irc_ns_name_ntop(const char *src, char *dst, size_t dstsiz)
                        }
                        *dn++ = '.';
                }
-               if ((l = labellen((unsigned char*)(cp - 1))) < 0) {
+               if ((l = labellen((const unsigned char*)(cp - 1))) < 0) {
                        errno = EMSGSIZE; /* XXX */
                        return(-1);
                }