From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 4 Nov 2006 12:18:06 +0000 (+0100)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~61^2~2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9c199c432be4160deb06233fd70420a4568ccf86;hp=961f67433e56597c91baf46cfb63a9b89fa41134;p=collectd.git

Merge branch 'collectd-3.10'
---

diff --git a/src/ntpd.c b/src/ntpd.c
index d65d1ed9..b65a9e8f 100644
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -694,6 +694,7 @@ static int ntpd_receive_response (int req_code, int *res_items, int *res_size,
 				(items_num + pkt_item_num) * res_item_size);
 		items = realloc ((void *) *res_data,
 				(items_num + pkt_item_num) * res_item_size);
+		items_num += pkt_item_num;
 		if (items == NULL)
 		{
 			items = *res_data;
@@ -881,7 +882,7 @@ static void ntpd_read (void)
 		struct info_peer_summary *ptr;
 		double offset;
 
-		char peername[512];
+		char peername[NI_MAXHOST];
 		int refclock_id;
 		
 		ptr = ps + i;