projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectctl: define LOCALSTATEDIR if not defined
[collectd.git]
/
src
/
openldap.c
diff --git
a/src/openldap.c
b/src/openldap.c
index
615aee3
..
d424cb4
100644
(file)
--- a/
src/openldap.c
+++ b/
src/openldap.c
@@
-27,9
+27,9
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#if defined(__APPLE__)
#pragma clang diagnostic push
#if defined(__APPLE__)
#pragma clang diagnostic push
@@
-208,7
+208,7
@@
static void cldap_submit_gauge (const char *type, const char *type_instance, /*
static int cldap_read_host (user_data_t *ud) /* {{{ */
{
cldap_t *st;
static int cldap_read_host (user_data_t *ud) /* {{{ */
{
cldap_t *st;
- LDAPMessage *
e, *
result;
+ LDAPMessage *result;
char *dn;
int rc;
int status;
char *dn;
int rc;
int status;
@@
-249,7
+249,7
@@
static int cldap_read_host (user_data_t *ud) /* {{{ */
return (-1);
}
return (-1);
}
- for (e = ldap_first_entry (st->ld, result); e != NULL;
+ for (
LDAPMessage *
e = ldap_first_entry (st->ld, result); e != NULL;
e = ldap_next_entry (st->ld, e))
{
if ((dn = ldap_get_dn (st->ld, e)) != NULL)
e = ldap_next_entry (st->ld, e))
{
if ((dn = ldap_get_dn (st->ld, e)) != NULL)
@@
-558,7
+558,6
@@
static int cldap_read_host (user_data_t *ud) /* {{{ */
static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
{
cldap_t *st;
static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
{
cldap_t *st;
- int i;
int status;
st = calloc (1, sizeof (*st));
int status;
st = calloc (1, sizeof (*st));
@@
-580,7
+579,7
@@
static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
st->verifyhost = 1;
st->version = LDAP_VERSION3;
st->verifyhost = 1;
st->version = LDAP_VERSION3;
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-624,9
+623,8
@@
static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
if ((status == 0) && (st->url != NULL))
{
LDAPURLDesc *ludpp;
if ((status == 0) && (st->url != NULL))
{
LDAPURLDesc *ludpp;
- int rc;
- if (
(rc = ldap_url_parse (st->url, &ludpp)
) != 0)
+ if (
ldap_url_parse (st->url, &ludpp
) != 0)
{
ERROR ("openldap plugin: Instance `%s': "
"Invalid URL: `%s'",
{
ERROR ("openldap plugin: Instance `%s': "
"Invalid URL: `%s'",
@@
-654,21
+652,20
@@
static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
}
else
{
}
else
{
- user_data_t ud;
- char callback_name[3*DATA_MAX_NAME_LEN];
+ char callback_name[3*DATA_MAX_NAME_LEN] = { 0 };
databases = temp;
databases[databases_num] = st;
databases_num++;
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,
ssnprintf (callback_name, sizeof (callback_name),
"openldap/%s/%s",
(st->host != NULL) ? st->host : hostname_g,
- (st->name != NULL) ? st->name : "default"),
+ (st->name != NULL) ? st->name : "default");
+
+ user_data_t ud = {
+ .data = st
+ };
status = plugin_register_complex_read (/* group = */ NULL,
/* name = */ callback_name,
status = plugin_register_complex_read (/* group = */ NULL,
/* name = */ callback_name,
@@
-689,10
+686,9
@@
static int cldap_config_add (oconfig_item_t *ci) /* {{{ */
static int cldap_config (oconfig_item_t *ci) /* {{{ */
{
static int cldap_config (oconfig_item_t *ci) /* {{{ */
{
- int i;
int status = 0;
int status = 0;
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-722,9
+718,7
@@
static int cldap_init (void) /* {{{ */
static int cldap_shutdown (void) /* {{{ */
{
static int cldap_shutdown (void) /* {{{ */
{
- size_t i;
-
- for (i = 0; i < databases_num; i++)
+ for (size_t i = 0; i < databases_num; i++)
if (databases[i]->ld != NULL)
ldap_unbind_ext_s (databases[i]->ld, NULL, NULL);
sfree (databases);
if (databases[i]->ld != NULL)
ldap_unbind_ext_s (databases[i]->ld, NULL, NULL);
sfree (databases);