From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 16 Oct 2015 09:07:31 +0000 (+0200)
Subject: openldap: properly UNBIND from server on shutdown
X-Git-Tag: collectd-5.6.0~300^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6f34350038197af824053e08638ce5f71f2bb21f;p=collectd.git

openldap: properly UNBIND from server on shutdown

The idea is to call ldap_unbind_ext_s(), which notifies the ldap server
we're disconnecting.

We need to keep a reference to each configured databases in a global
variable so that the shutdown function can reach them in due time.

code & logic stolen from dbi.c/postgresql.c
---

diff --git a/src/openldap.c b/src/openldap.c
index ebaab134..0c88f8cc 100644
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -53,6 +53,9 @@ struct cldap_s /* {{{ */
 };
 typedef struct cldap_s cldap_t; /* }}} */
 
+static cldap_t **databases   = NULL;
+static size_t  databases_num = 0;
+
 static void cldap_free (cldap_t *st) /* {{{ */
 {
 	if (st == NULL)
@@ -641,23 +644,40 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 
 	if (status == 0)
 	{
-		user_data_t ud;
-		char callback_name[3*DATA_MAX_NAME_LEN];
-
-		memset (&ud, 0, sizeof (ud));
-		ud.data = st;
-
-		memset (callback_name, 0, sizeof (callback_name));
-		ssnprintf (callback_name, sizeof (callback_name),
-				"openldap/%s/%s",
-				(st->host != NULL) ? st->host : hostname_g,
-				(st->name != NULL) ? st->name : "default"),
-
-		status = plugin_register_complex_read (/* group = */ NULL,
-				/* name      = */ callback_name,
-				/* callback  = */ cldap_read_host,
-				/* interval  = */ 0,
-				/* user_data = */ &ud);
+		cldap_t **temp;
+
+		temp = (cldap_t **) realloc (databases,
+			sizeof (*databases) * (databases_num + 1));
+
+		if (temp == NULL)
+		{
+			ERROR ("openldap plugin: realloc failed");
+			status = -1;
+		}
+		else
+		{
+			user_data_t ud;
+			char callback_name[3*DATA_MAX_NAME_LEN];
+
+			databases = temp;
+			databases[databases_num] = st;
+			databases_num++;
+
+			memset (&ud, 0, sizeof (ud));
+			ud.data = st;
+
+			memset (callback_name, 0, sizeof (callback_name));
+			ssnprintf (callback_name, sizeof (callback_name),
+					"openldap/%s/%s",
+					(st->host != NULL) ? st->host : hostname_g,
+					(st->name != NULL) ? st->name : "default"),
+
+			status = plugin_register_complex_read (/* group = */ NULL,
+					/* name      = */ callback_name,
+					/* callback  = */ cldap_read_host,
+					/* interval  = */ 0,
+					/* user_data = */ &ud);
+		}
 	}
 
 	if (status != 0)
@@ -702,8 +722,22 @@ static int cldap_init (void) /* {{{ */
 	return (0);
 } /* }}} int cldap_init */
 
+static int cldap_shutdown (void) /* {{{ */
+{
+	size_t i;
+
+	for (i = 0; i < databases_num; i++)
+		if (databases[i]->ld != NULL)
+			ldap_unbind_ext_s (databases[i]->ld, NULL, NULL);
+	sfree (databases);
+	databases_num = 0;
+
+	return (0);
+} /* }}} int cldap_shutdown */
+
 void module_register (void) /* {{{ */
 {
 	plugin_register_complex_config ("openldap", cldap_config);
 	plugin_register_init ("openldap", cldap_init);
+	plugin_register_shutdown ("openldap", cldap_shutdown);
 } /* }}} void module_register */