From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 24 Nov 2014 08:18:44 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.3
X-Git-Tag: collectd-5.3.2~20
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=51a4e62d7d0e73d8d5822efaef1e3218b5ad0373;hp=cfce0a60ee7d57148067ef7ea600410e566bd322

Merge branch 'collectd-4.10' into collectd-5.3
---

diff --git a/src/plugin.c b/src/plugin.c
index d3767d12..ed962a72 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -332,7 +332,7 @@ static int plugin_load_file (char *file, uint32_t flags)
 
 		ssnprintf (errbuf, sizeof (errbuf),
 				"lt_dlopen (\"%s\") failed: %s. "
-				"The most common cause for this problem are "
+				"The most common cause for this problem is "
 				"missing dependencies. Use ldd(1) to check "
 				"the dependencies of the plugin "
 				"/ shared object.",
diff --git a/src/snmp.c b/src/snmp.c
index 3e6cb911..7d340d18 100644
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1316,6 +1316,8 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
         snmp_free_pdu (res);
       res = NULL;
 
+      /* snmp_synch_response already freed our PDU */
+      req = NULL;
       sfree (errstr);
       csnmp_host_close_session (host);