From: Florian Forster <octo@collectd.org>
Date: Sun, 28 Jun 2015 13:05:36 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79593ed5e0a3def8e91be5b1de15a536af2d4a92;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

79593ed5e0a3def8e91be5b1de15a536af2d4a92
diff --cc src/daemon/common.c
index 472039915,c28494205..b2448086c
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@@ -507,18 -438,21 +507,18 @@@ int escape_slashes (char *buffer, size_
  		return (0);
  	}
  
 -	if (buf_len <= 1)
 -		return (0);
 -
  	/* Move one to the left */
 -	if (buf[0] == '/')
 -		memmove (buf, buf + 1, buf_len - 1);
 +	if (buffer[0] == '/')
 +	{
 +		memmove (buffer, buffer + 1, buffer_len);
 +		buffer_len--;
 +	}
  
- 	for (i = 0; i < buffer_len - 1; i++)
 -	for (i = 0; i < buf_len; i++)
++	for (i = 0; i < buffer_len; i++)
  	{
 -		if (buf[i] == '\0')
 -			break;
 -		else if (buf[i] == '/')
 -			buf[i] = '_';
 +		if (buffer[i] == '/')
 +			buffer[i] = '_';
  	}
 -	buf[i] = '\0';
  
  	return (0);
  } /* int escape_slashes */
diff --cc src/tcpconns.c
index b6a3fdda3,bf07a2a28..5d4bb6966
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@@ -979,18 -929,14 +979,20 @@@ static int conn_read (void
    next = (struct inpcb *)CIRCLEQ_FIRST (&table.inpt_queue);
  
    while (next != head)
 +#endif
    {
      /* Read the pcb pointed to by `next' into `inpcb' */
-     kread ((u_long) next, &inpcb, sizeof (inpcb));
+     status = kread ((u_long) next, &inpcb, sizeof (inpcb));
+     if (status != 0)
+       return (-1);
  
      /* Advance `next' */
 +#if defined(__OpenBSD__) || (defined(__NetBSD_Version__) && __NetBSD_Version__ > 699002700)
 +    /* inpt_queue is a TAILQ on OpenBSD */
 +    next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue);
 +#else
      next = (struct inpcb *)CIRCLEQ_NEXT (&inpcb, inp_queue);
 +#endif
  
      /* Ignore sockets, that are not connected. */
  #ifdef __NetBSD__