Automated merge with http://angelforce.ru:8000/

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

diff --git a/src/reslib.c b/src/reslib.c
index fce6f05ef1d9640d1acd4899225a0fc0fc5391eb..d2b029cfd308ae74022d0a141856eae495858371 100644 (file)
--- a/src/reslib.c
+++ b/src/reslib.c
@@ -84,17 +84,14 @@
 #include "ircd_defs.h"
 #include "common.h"
 #include "ircd.h"
-#include "commio.h"
 #include "res.h"
 #include "reslib.h"
-#include "tools.h"
-#include "event.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
 
 #define NS_TYPE_ELT             0x40 /* EDNS0 extended label type */
 #define DNS_LABELTYPE_BITSTRING 0x41
-#define MAXLINE 128
+#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 $ */
@@ -167,7 +164,7 @@ parse_resvconf(void)
   char *p;
   char *opt;
   char *arg;
-  char input[MAXLINE];
+  char input[DNS_MAXLINE];
   FILE *file;
 
   /* XXX "/etc/resolv.conf" should be from a define in setup.h perhaps
@@ -252,7 +249,7 @@ add_nameserver(const char *arg)
     return;
 
   memcpy(&irc_nsaddr_list[irc_nscount], res->ai_addr, res->ai_addrlen);
-  SET_SS_LEN(irc_nsaddr_list[irc_nscount], res->ai_addrlen);
+  SET_SS_LEN(&irc_nsaddr_list[irc_nscount], res->ai_addrlen);
   irc_nscount++;
   freeaddrinfo(res);
 }