From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 22 Jul 2006 20:34:27 +0000 (+0200)
Subject: Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd... 
X-Git-Tag: collectd-3.10.2~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=179d9b650db685f5f04f36a3019e4ffea377d960;hp=7e2c12a9fd5b22ddecd7454945ac1ec2061e9050;p=collectd.git

Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd-3.10
---

diff --git a/ChangeLog b/ChangeLog
index 1ca08175..3c6fa297 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-19, Version 3.10.1
+	* A bug in the apcups plugin was fixed: Is the plugin is loaded, but
+	  the apcups cannot be reached, unconnected sockets will pile up and
+	  eventually lead to `Too many open files' errors.
+
 2006-07-09, Version 3.10.0
 	* The `disk' plugin has been ported to Darwin.
 	* The `battery' plugin should work on many Apple computers now.
diff --git a/configure.in b/configure.in
index 75ad33f4..f187cf38 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.10.0)
+AC_INIT(collectd, 3.10.1)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
diff --git a/debian/changelog b/debian/changelog
index 27650924..28b2e5e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.10.1-0octo1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Florian Forster <octo@verplant.org>  Wed, 19 Jul 2006 18:49:16 +0200
+
 collectd (3.10.0-1) unstable; urgency=low
 
   * New upstream version
diff --git a/src/apcups.c b/src/apcups.c
index 9117bdae..f7486f5f 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -208,6 +208,7 @@ static int net_open (char *host, char *service, int port)
 	if (status != 0) /* `connect(2)' failed */
 	{
 		DBG ("connect failed: %s", strerror (errno));
+		close (sd);
 		return (-1);
 	}