};
typedef struct ldap_s ldap_t; /* }}} */
-static int ldap_read_host (user_data_t *ud);
-
static void ldap_free (ldap_t *st) /* {{{ */
{
if(st == NULL)
ldap_memfree(st->ld);
sfree (st);
} /* }}} void ldap_free */
-
-/* Configuration handling functions {{{
- *
- * <Plugin ldap>
- * <Instance "plugin_instance1">
- * URL "ldap://localhost"
- * ...
- * </Instance>
- * </Plugin>
- */
-
-static int config_set_string (char **ret_string, /* {{{ */
- oconfig_item_t *ci)
-{
- char *string;
-
- if ((ci->values_num != 1)
- || (ci->values[0].type != OCONFIG_TYPE_STRING))
- {
- WARNING ("openldap plugin: The `%s' config option "
- "needs exactly one string argument.", ci->key);
- return (-1);
- }
-
- string = strdup (ci->values[0].value.string);
- if (string == NULL)
- {
- ERROR ("openldap plugin: strdup failed.");
- return (-1);
- }
-
- if (*ret_string != NULL)
- free (*ret_string);
- *ret_string = string;
-
- return (0);
-} /* }}} int config_set_string */
-
-static int config_set_int (int *ret_int, /* {{{ */
- oconfig_item_t *ci)
-{
- if ((ci->values_num != 1)
- || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
- {
- WARNING ("openldap plugin: The `%s' config option "
- "needs exactly one string argument.", ci->key);
- return (-1);
- }
-
- *ret_int = ci->values[0].value.number;
-
- return (0);
-} /* }}} int config_set_int */
-
-static int config_set_bool (int *ret_boolean, /* {{{ */
- oconfig_item_t *ci)
-{
- int status = 0;
-
- if (ci->values_num != 1)
- status = -1;
-
- if (status == 0)
- {
- if (ci->values[0].type == OCONFIG_TYPE_BOOLEAN)
- *ret_boolean = ci->values[0].value.boolean;
- else if (ci->values[0].type == OCONFIG_TYPE_STRING)
- {
- if (IS_TRUE (ci->values[0].value.string))
- *ret_boolean = 1;
- else if (IS_FALSE (ci->values[0].value.string))
- *ret_boolean = 0;
- else
- status = -1;
- }
- else
- status = -1;
- }
-
- if (status != 0)
- {
- WARNING ("openldap plugin: The `%s' config option "
- "needs exactly one boolean argument.", ci->key);
- return (-1);
- }
- return (0);
-} /* }}} config_set_bool */
-
-static int config_add (oconfig_item_t *ci) /* {{{ */
-{
- ldap_t *st;
- int i;
- int status;
-
- if ((ci->values_num != 1)
- || (ci->values[0].type != OCONFIG_TYPE_STRING))
- {
- WARNING ("openldap plugin: The `%s' config option "
- "needs exactly one string argument.", ci->key);
- return (-1);
- }
-
- st = (ldap_t *) malloc (sizeof (*st));
- if (st == NULL)
- {
- ERROR ("openldap plugin: malloc failed.");
- return (-1);
- }
- memset (st, 0, sizeof (*st));
-
- status = config_set_string (&st->name, ci);
- if (status != 0)
- {
- sfree (st);
- return (status);
- }
-
- st->verifyhost = 1;
- st->version = LDAP_VERSION3;
-
- for (i = 0; i < ci->children_num; i++)
- {
- oconfig_item_t *child = ci->children + i;
-
- if (strcasecmp ("CACert", child->key) == 0)
- status = config_set_string (&st->cacert, child);
- else if (strcasecmp ("StartTLS", child->key) == 0)
- status = config_set_bool (&st->starttls, child);
- else if (strcasecmp ("Timeout", child->key) == 0)
- status = config_set_int (&st->timeout, child);
- else if (strcasecmp ("URL", child->key) == 0)
- status = config_set_string (&st->url, child);
- else if (strcasecmp ("VerifyHost", child->key) == 0)
- status = config_set_bool (&st->verifyhost, child);
- else if (strcasecmp ("Version", child->key) == 0)
- status = config_set_int (&st->version, child);
- else
- {
- WARNING ("openldap plugin: Option `%s' not allowed here.",
- child->key);
- status = -1;
- }
-
- if (status != 0)
- break;
- }
-
- /* Check if struct is complete.. */
- if ((status == 0) && (st->url == NULL))
- {
- ERROR ("openldap plugin: Instance `%s': "
- "No URL has been configured.",
- st->name);
- status = -1;
- }
-
- /* Check if URL is valid */
- if ((status == 0) && (st->url != NULL))
- {
- LDAPURLDesc *ludpp;
- int rc;
-
- if ((rc = ldap_url_parse( st->url, &ludpp)) != 0)
- {
- ERROR ("openldap plugin: Instance `%s': "
- "Invalid URL: `%s'",
- st->name, st->url);
- status = -1;
- }
- else
- {
- st->host = strdup (ludpp->lud_host);
- }
-
- ldap_free_urldesc(ludpp);
- }
-
- if (status == 0)
- {
- user_data_t ud;
- char callback_name[3*DATA_MAX_NAME_LEN];
-
- memset (&ud, 0, sizeof (ud));
- ud.data = st;
- ud.free_func = (void *) ldap_free;
-
- 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 = */ ldap_read_host,
- /* interval = */ NULL,
- /* user_data = */ &ud);
- }
-
- if (status != 0)
- {
- ldap_free (st);
- return (-1);
- }
-
- return (0);
-} /* }}} int config_add */
-
-static int config (oconfig_item_t *ci)
-{
- int i;
- int status = 0;
-
- for (i = 0; i < ci->children_num; i++)
- {
- oconfig_item_t *child = ci->children + i;
-
- if (strcasecmp ("Instance", child->key) == 0)
- config_add (child);
- else
- WARNING ("openldap plugin: The configuration option "
- "\"%s\" is not allowed here. Did you "
- "forget to add an <Instance /> block "
- "around the configuration?",
- child->key);
- } /* for (ci->children) */
-
- return (status);
-} /* int config */
-
-/* }}} End of configuration handling functions */
-
/* initialize ldap for each host */
-static int init_host (ldap_t *st)
+static int ldap_init_host (ldap_t *st) /* {{{ */
{
LDAP *ld;
int rc;
ERROR ("openldap plugin: Failed to start tls on %s: %s",
st->url, ldap_err2string (rc));
st->state = 0;
+ ldap_destroy(st->ld);
return (-1);
}
}
ERROR ("openldap plugin: Failed to bind to %s: %s",
st->url, ldap_err2string (rc));
st->state = 0;
+ ldap_destroy(st->ld);
return (-1);
}
else
st->state = 1;
return (0);
}
-} /* static init_host (ldap_t *st) */
+} /* }}} static ldap_init_host */
-static void submit_value (const char *type, const char *type_instance,
+static void ldap_submit_value (const char *type, const char *type_instance, /* {{{ */
value_t value, ldap_t *st)
{
value_list_t vl = VALUE_LIST_INIT;
sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
-} /* submit */
+} /* }}} void ldap_submit_value */
-static void submit_derive (const char *type, const char *type_instance,
+static void ldap_submit_derive (const char *type, const char *type_instance, /* {{{ */
derive_t d, ldap_t *st)
{
value_t v;
v.derive = d;
- submit_value (type, type_instance, v, st);
-} /* void submit_derive */
+ ldap_submit_value (type, type_instance, v, st);
+} /* }}} void ldap_submit_derive */
-static void submit_gauge (const char *type, const char *type_instance,
+static void ldap_submit_gauge (const char *type, const char *type_instance, /* {{{ */
gauge_t g, ldap_t *st)
{
value_t v;
v.gauge = g;
- submit_value (type, type_instance, v, st);
-} /* void submit_gauge */
+ ldap_submit_value (type, type_instance, v, st);
+} /* }}} void ldap_submit_gauge */
-static int ldap_read_host (user_data_t *ud)
+static int ldap_read_host (user_data_t *ud) /* {{{ */
{
ldap_t *st;
LDAPMessage *e, *result;
int rc;
int status;
- char *attrs[3] = { "monitorCounter",
+ char *attrs[8] = { "monitorCounter",
"monitorOpCompleted",
- "monitorOpInitiated" };
+ "monitorOpInitiated",
+ "monitoredInfo",
+ "olmBDBEntryCache",
+ "olmBDBDNCache",
+ "olmBDBIDLCache",
+ "namingContexts" };
if ((ud == NULL) || (ud->data == NULL))
{
st = (ldap_t *) ud->data;
- status = init_host (st);
+ status = ldap_init_host (st);
if (status != 0)
return (-1);
rc = ldap_search_ext_s (st->ld, "cn=Monitor", LDAP_SCOPE_SUBTREE,
- "(!(cn=* *))", attrs, 0,
+ "(|(!(cn=* *))(cn=Database*))", attrs, 0,
NULL, NULL, NULL, 0, &result);
if (rc != LDAP_SUCCESS)
unsigned long long counter = 0;
unsigned long long opc = 0;
unsigned long long opi = 0;
+ unsigned long long info = 0;
struct berval counter_data;
struct berval opc_data;
struct berval opi_data;
+ struct berval info_data;
+ struct berval olmbdb_data;
+ struct berval nc_data;
struct berval **counter_list;
struct berval **opc_list;
struct berval **opi_list;
+ struct berval **info_list;
+ struct berval **olmbdb_list;
+ struct berval **nc_list;
if ((counter_list = ldap_get_values_len (st->ld, e,
"monitorCounter")) != NULL)
opi = atoll (opi_data.bv_val);
}
+ if ((info_list = ldap_get_values_len (st->ld, e,
+ "monitoredInfo")) != NULL)
+ {
+ info_data = *info_list[0];
+ info = atoll (info_data.bv_val);
+ }
+
if (strcmp (dn, "cn=Total,cn=Connections,cn=Monitor")
== 0)
{
- submit_derive ("total_connections", NULL,
+ ldap_submit_derive ("total_connections", NULL,
counter, st);
}
else if (strcmp (dn,
"cn=Current,cn=Connections,cn=Monitor")
== 0)
{
- submit_gauge ("current_connections", NULL,
+ ldap_submit_gauge ("current_connections", NULL,
counter, st);
}
else if (strcmp (dn,
"cn=Operations,cn=Monitor") == 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"initiated", opi, st);
}
else if (strcmp (dn,
"cn=Bind,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"bind-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"bind-initiated", opi, st);
}
else if (strcmp (dn,
"cn=UnBind,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"unbind-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"unbind-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Search,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"search-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"search-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Compare,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"compare-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"compare-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Modify,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"modify-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"modify-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Modrdn,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"modrdn-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"modrdn-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Add,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"add-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"add-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Delete,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"delete-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"delete-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Abandon,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"abandon-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"abandon-initiated", opi, st);
}
else if (strcmp (dn,
"cn=Extended,cn=Operations,cn=Monitor")
== 0)
{
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"extended-completed", opc, st);
- submit_derive ("operations",
+ ldap_submit_derive ("operations",
"extended-initiated", opi, st);
}
+ else if ((strncmp (dn, "cn=Database", 11) == 0)
+ && ((nc_list = ldap_get_values_len
+ (st->ld, e, "namingContexts")) != NULL))
+ {
+ nc_data = *nc_list[0];
+ char typeinst[DATA_MAX_NAME_LEN];
+
+ if ((olmbdb_list = ldap_get_values_len (st->ld, e,
+ "olmBDBEntryCache")) != NULL)
+ {
+ olmbdb_data = *olmbdb_list[0];
+ ssnprintf (typeinst, sizeof (typeinst),
+ "bdbentrycache-%s", nc_data.bv_val);
+ ldap_submit_gauge ("cache_size", typeinst,
+ atoll (olmbdb_data.bv_val), st);
+ ldap_value_free_len (olmbdb_list);
+ }
+
+ if ((olmbdb_list = ldap_get_values_len (st->ld, e,
+ "olmBDBDNCache")) != NULL)
+ {
+ olmbdb_data = *olmbdb_list[0];
+ ssnprintf (typeinst, sizeof (typeinst),
+ "bdbdncache-%s", nc_data.bv_val);
+ ldap_submit_gauge ("cache_size", typeinst,
+ atoll (olmbdb_data.bv_val), st);
+ ldap_value_free_len (olmbdb_list);
+ }
+
+ if ((olmbdb_list = ldap_get_values_len (st->ld, e,
+ "olmBDBIDLCache")) != NULL)
+ {
+ olmbdb_data = *olmbdb_list[0];
+ ssnprintf (typeinst, sizeof (typeinst),
+ "bdbidlcache-%s", nc_data.bv_val);
+ ldap_submit_gauge ("cache_size", typeinst,
+ atoll (olmbdb_data.bv_val), st);
+ ldap_value_free_len (olmbdb_list);
+ }
+
+ ldap_value_free_len (nc_list);
+ }
else if (strcmp (dn,
"cn=Bytes,cn=Statistics,cn=Monitor")
== 0)
{
- submit_derive ("derive", "statistics-bytes",
+ ldap_submit_derive ("derive", "statistics-bytes",
counter, st);
}
else if (strcmp (dn,
- "cn=PUD,cn=Statistics,cn=Monitor")
+ "cn=PDU,cn=Statistics,cn=Monitor")
== 0)
{
- submit_derive ("derive", "statistics-pdu",
+ ldap_submit_derive ("derive", "statistics-pdu",
counter, st);
}
else if (strcmp (dn,
"cn=Entries,cn=Statistics,cn=Monitor")
== 0)
{
- submit_derive ("derive", "statistics-entries",
+ ldap_submit_derive ("derive", "statistics-entries",
counter, st);
}
else if (strcmp (dn,
"cn=Referrals,cn=Statistics,cn=Monitor")
== 0)
{
- submit_derive ("derive", "statistics-referrals",
+ ldap_submit_derive ("derive", "statistics-referrals",
counter, st);
}
else if (strcmp (dn,
+ "cn=Open,cn=Threads,cn=Monitor")
+ == 0)
+ {
+ ldap_submit_gauge ("threads", "threads-open",
+ info, st);
+ }
+ else if (strcmp (dn,
+ "cn=Starting,cn=Threads,cn=Monitor")
+ == 0)
+ {
+ ldap_submit_gauge ("threads", "threads-starting",
+ info, st);
+ }
+ else if (strcmp (dn,
+ "cn=Active,cn=Threads,cn=Monitor")
+ == 0)
+ {
+ ldap_submit_gauge ("threads", "threads-active",
+ info, st);
+ }
+ else if (strcmp (dn,
+ "cn=Pending,cn=Threads,cn=Monitor")
+ == 0)
+ {
+ ldap_submit_gauge ("threads", "threads-pending",
+ info, st);
+ }
+ else if (strcmp (dn,
+ "cn=Backload,cn=Threads,cn=Monitor")
+ == 0)
+ {
+ ldap_submit_gauge ("threads", "threads-backload",
+ info, st);
+ }
+ else if (strcmp (dn,
"cn=Read,cn=Waiters,cn=Monitor")
== 0)
{
- submit_derive ("derive", "waiters-read",
+ ldap_submit_derive ("derive", "waiters-read",
counter, st);
}
else if (strcmp (dn,
"cn=Write,cn=Waiters,cn=Monitor")
== 0)
{
- submit_derive ("derive", "waiters-write",
+ ldap_submit_derive ("derive", "waiters-write",
counter, st);
}
ldap_value_free_len (counter_list);
ldap_value_free_len (opc_list);
ldap_value_free_len (opi_list);
+ ldap_value_free_len (info_list);
}
ldap_memfree (dn);
ldap_msgfree (result);
ldap_unbind_ext_s (st->ld, NULL, NULL);
return (0);
-} /* int ldap_read_host */
+} /* }}} int ldap_read_host */
+
+/* Configuration handling functions {{{
+ *
+ * <Plugin ldap>
+ * <Instance "plugin_instance1">
+ * URL "ldap://localhost"
+ * ...
+ * </Instance>
+ * </Plugin>
+ */
+
+static int ldap_config_set_string (char **ret_string, /* {{{ */
+ oconfig_item_t *ci)
+{
+ char *string;
+
+ if ((ci->values_num != 1)
+ || (ci->values[0].type != OCONFIG_TYPE_STRING))
+ {
+ WARNING ("openldap plugin: The `%s' config option "
+ "needs exactly one string argument.", ci->key);
+ return (-1);
+ }
+
+ string = strdup (ci->values[0].value.string);
+ if (string == NULL)
+ {
+ ERROR ("openldap plugin: strdup failed.");
+ return (-1);
+ }
+
+ if (*ret_string != NULL)
+ free (*ret_string);
+ *ret_string = string;
+
+ return (0);
+} /* }}} int ldap_config_set_string */
+
+static int ldap_config_set_int (int *ret_int, /* {{{ */
+ oconfig_item_t *ci)
+{
+ if ((ci->values_num != 1)
+ || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
+ {
+ WARNING ("openldap plugin: The `%s' config option "
+ "needs exactly one string argument.", ci->key);
+ return (-1);
+ }
+
+ *ret_int = ci->values[0].value.number;
+
+ return (0);
+} /* }}} int ldap_config_set_int */
+
+static int ldap_config_set_bool (int *ret_boolean, /* {{{ */
+ oconfig_item_t *ci)
+{
+ int status = 0;
+
+ if (ci->values_num != 1)
+ status = -1;
+
+ if (status == 0)
+ {
+ if (ci->values[0].type == OCONFIG_TYPE_BOOLEAN)
+ *ret_boolean = ci->values[0].value.boolean;
+ else if (ci->values[0].type == OCONFIG_TYPE_STRING)
+ {
+ if (IS_TRUE (ci->values[0].value.string))
+ *ret_boolean = 1;
+ else if (IS_FALSE (ci->values[0].value.string))
+ *ret_boolean = 0;
+ else
+ status = -1;
+ }
+ else
+ status = -1;
+ }
+
+ if (status != 0)
+ {
+ WARNING ("openldap plugin: The `%s' config option "
+ "needs exactly one boolean argument.", ci->key);
+ return (-1);
+ }
+ return (0);
+} /* }}} int ldap_config_set_bool */
+
+static int ldap_config_add (oconfig_item_t *ci) /* {{{ */
+{
+ ldap_t *st;
+ int i;
+ int status;
+
+ if ((ci->values_num != 1)
+ || (ci->values[0].type != OCONFIG_TYPE_STRING))
+ {
+ WARNING ("openldap plugin: The `%s' config option "
+ "needs exactly one string argument.", ci->key);
+ return (-1);
+ }
+
+ st = (ldap_t *) malloc (sizeof (*st));
+ if (st == NULL)
+ {
+ ERROR ("openldap plugin: malloc failed.");
+ return (-1);
+ }
+ memset (st, 0, sizeof (*st));
+
+ status = ldap_config_set_string (&st->name, ci);
+ if (status != 0)
+ {
+ sfree (st);
+ return (status);
+ }
+
+ st->verifyhost = 1;
+ st->version = LDAP_VERSION3;
+
+ for (i = 0; i < ci->children_num; i++)
+ {
+ oconfig_item_t *child = ci->children + i;
+
+ if (strcasecmp ("CACert", child->key) == 0)
+ status = ldap_config_set_string (&st->cacert, child);
+ else if (strcasecmp ("StartTLS", child->key) == 0)
+ status = ldap_config_set_bool (&st->starttls, child);
+ else if (strcasecmp ("Timeout", child->key) == 0)
+ status = ldap_config_set_int (&st->timeout, child);
+ else if (strcasecmp ("URL", child->key) == 0)
+ status = ldap_config_set_string (&st->url, child);
+ else if (strcasecmp ("VerifyHost", child->key) == 0)
+ status = ldap_config_set_bool (&st->verifyhost, child);
+ else if (strcasecmp ("Version", child->key) == 0)
+ status = ldap_config_set_int (&st->version, child);
+ else
+ {
+ WARNING ("openldap plugin: Option `%s' not allowed here.",
+ child->key);
+ status = -1;
+ }
+
+ if (status != 0)
+ break;
+ }
+
+ /* Check if struct is complete.. */
+ if ((status == 0) && (st->url == NULL))
+ {
+ ERROR ("openldap plugin: Instance `%s': "
+ "No URL has been configured.",
+ st->name);
+ status = -1;
+ }
+
+ /* Check if URL is valid */
+ if ((status == 0) && (st->url != NULL))
+ {
+ LDAPURLDesc *ludpp;
+ int rc;
+
+ if ((rc = ldap_url_parse( st->url, &ludpp)) != 0)
+ {
+ ERROR ("openldap plugin: Instance `%s': "
+ "Invalid URL: `%s'",
+ st->name, st->url);
+ status = -1;
+ }
+ else
+ {
+ st->host = strdup (ludpp->lud_host);
+ }
+
+ ldap_free_urldesc(ludpp);
+ }
+
+ 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 = */ ldap_read_host,
+ /* interval = */ NULL,
+ /* user_data = */ &ud);
+ }
+
+ if (status != 0)
+ {
+ ldap_free (st);
+ return (-1);
+ }
+
+ return (0);
+} /* }}} int ldap_config_add */
+
+static int ldap_config (oconfig_item_t *ci) /* {{{ */
+{
+ int i;
+ int status = 0;
+
+ for (i = 0; i < ci->children_num; i++)
+ {
+ oconfig_item_t *child = ci->children + i;
+
+ if (strcasecmp ("Instance", child->key) == 0)
+ ldap_config_add (child);
+ else
+ WARNING ("openldap plugin: The configuration option "
+ "\"%s\" is not allowed here. Did you "
+ "forget to add an <Instance /> block "
+ "around the configuration?",
+ child->key);
+ } /* for (ci->children) */
+
+ return (status);
+} /* }}} int ldap_config */
+
+/* }}} End of configuration handling functions */
-void module_register (void)
+void module_register (void) /* {{{ */
{
- plugin_register_complex_config ("openldap", config);
-} /* void module_register */
+ plugin_register_complex_config ("openldap", ldap_config);
+} /* }}} void module_register */
projects / collectd.git / blobdiff