Automated merge with ssh://hg.atheme.org//hg/charybdis

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

diff --git a/src/res.c b/src/res.c
index 88170f0aa74f5bae8b39dc5725217385fcbf30b0..a04b9735bfa37db433412a46ff654bd7657ae1c3 100644 (file)
--- a/src/res.c
+++ b/src/res.c
@@ -7,7 +7,7 @@
  * The authors takes no responsibility for any damage or loss
  * of property which results from the use of this software.
  *
- * $Id: res.c 2023 2006-09-02 23:47:27Z jilles $
+ * $Id: res.c 3301 2007-03-28 15:04:06Z jilles $
  * from Hybrid Id: res.c 459 2006-02-12 22:21:37Z db $
  *
  * July 1999 - Rewrote a bunch of stuff here. Change hostent builder code,
@@ -352,7 +352,7 @@ static int send_res_msg(const char *msg, int len, int rcount)
        if (max_queries == 0)
                max_queries = 1;
 
-       for (i = 0; i < max_queries; i++)
+       for (i = 0; sent < max_queries && i < irc_nscount; i++)
        {
                if (sendto(res_fd, msg, len, 0,
                     (struct sockaddr *)&(irc_nsaddr_list[i]), 
@@ -408,7 +408,7 @@ static void do_query_name(struct DNSQuery *query, const char *name, struct resli
 {
        char host_name[HOSTLEN + 1];
 
-       strlcpy(host_name, name, HOSTLEN);
+       strlcpy(host_name, name, HOSTLEN + 1);
        add_local_domain(host_name, HOSTLEN);
 
        if (request == NULL)
@@ -682,7 +682,7 @@ static int proc_answer(struct reslist *request, HEADER * header, char *buf, char
                          else if (n == 0)
                                  return (0);   /* no more answers left */
 
-                         strlcpy(request->name, hostbuf, HOSTLEN);
+                         strlcpy(request->name, hostbuf, HOSTLEN + 1);
 
                          return (1);
                          break;