X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenldap.c;h=36a29f8dadb229a3955308035e71d3d012ca5c20;hb=895a5234dc9a798241747f703b05e5b51e3f5a33;hp=bd79b26b7312bf076c95a247f9d3331688e5f550;hpb=2bda2a5648c87a2c5b8304238cd80ff17984c5cd;p=collectd.git

diff --git a/src/openldap.c b/src/openldap.c
index bd79b26b..36a29f8d 100644
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -43,6 +43,8 @@ struct cldap_s /* {{{ */
 {
 	char *name;
 
+	char *binddn;
+	char *password;
 	char *cacert;
 	char *host;
 	int   state;
@@ -61,6 +63,8 @@ static void cldap_free (cldap_t *st) /* {{{ */
 	if (st == NULL)
 		return;
 
+	sfree (st->binddn);
+	sfree (st->password);
 	sfree (st->cacert);
 	sfree (st->host);
 	sfree (st->name);
@@ -115,10 +119,19 @@ static int cldap_init_host (cldap_t *st) /* {{{ */
 	}
 
 	struct berval cred;
-	cred.bv_val = "";
-	cred.bv_len = 0;
+	if (st->password != NULL)
+	{
+		cred.bv_val = st->password;
+		cred.bv_len = strlen (st->password);
+	}
+	else
+	{
+		cred.bv_val = "";
+		cred.bv_len = 0;
+	}
 
-	rc = ldap_sasl_bind_s (st->ld, NULL, NULL, &cred, NULL, NULL, NULL);
+	rc = ldap_sasl_bind_s (st->ld, st->binddn, LDAP_SASL_SIMPLE, &cred,
+			NULL, NULL, NULL);
 	if (rc != LDAP_SUCCESS)
 	{
 		ERROR ("openldap plugin: Failed to bind to %s: %s",
@@ -540,13 +553,12 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 	int i;
 	int status;
 
-	st = malloc (sizeof (*st));
+	st = calloc (1, sizeof (*st));
 	if (st == NULL)
 	{
-		ERROR ("openldap plugin: malloc failed.");
+		ERROR ("openldap plugin: calloc failed.");
 		return (-1);
 	}
-	memset (st, 0, sizeof (*st));
 
 	status = cf_util_get_string (ci, &st->name);
 	if (status != 0)
@@ -564,7 +576,11 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 	{
 		oconfig_item_t *child = ci->children + i;
 
-		if (strcasecmp ("CACert", child->key) == 0)
+		if (strcasecmp ("BindDN", child->key) == 0)
+			status = cf_util_get_string (child, &st->binddn);
+		else if (strcasecmp ("Password", child->key) == 0)
+			status = cf_util_get_string (child, &st->password);
+		else if (strcasecmp ("CACert", child->key) == 0)
 			status = cf_util_get_string (child, &st->cacert);
 		else if (strcasecmp ("StartTLS", child->key) == 0)
 			status = cf_util_get_boolean (child, &st->starttls);
@@ -635,7 +651,7 @@ static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
 		status = plugin_register_complex_read (/* group = */ NULL,
 				/* name      = */ callback_name,
 				/* callback  = */ cldap_read_host,
-				/* interval  = */ NULL,
+				/* interval  = */ 0,
 				/* user_data = */ &ud);
 	}