projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2378 from cramertj/grpc-meta
[collectd.git]
/
src
/
openldap.c
diff --git
a/src/openldap.c
b/src/openldap.c
index
5269e5f
..
227c8e1
100644
(file)
--- a/
src/openldap.c
+++ b/
src/openldap.c
@@
-85,14
+85,15
@@
static int cldap_init_host(cldap_t *st) /* {{{ */
if (st->state && st->ld) {
DEBUG("openldap plugin: Already connected to %s", st->url);
if (st->state && st->ld) {
DEBUG("openldap plugin: Already connected to %s", st->url);
- return
(0)
;
+ return
0
;
}
rc = ldap_initialize(&ld, st->url);
if (rc != LDAP_SUCCESS) {
ERROR("openldap plugin: ldap_initialize failed: %s", ldap_err2string(rc));
st->state = 0;
}
rc = ldap_initialize(&ld, st->url);
if (rc != LDAP_SUCCESS) {
ERROR("openldap plugin: ldap_initialize failed: %s", ldap_err2string(rc));
st->state = 0;
- ldap_unbind_ext_s(ld, NULL, NULL);
+ if (ld != NULL)
+ ldap_unbind_ext_s(ld, NULL, NULL);
return (-1);
}
return (-1);
}
@@
-119,7
+120,8
@@
static int cldap_init_host(cldap_t *st) /* {{{ */
ERROR("openldap plugin: Failed to start tls on %s: %s", st->url,
ldap_err2string(rc));
st->state = 0;
ERROR("openldap plugin: Failed to start tls on %s: %s", st->url,
ldap_err2string(rc));
st->state = 0;
- ldap_unbind_ext_s(st->ld, NULL, NULL);
+ if (st->ld != NULL)
+ ldap_unbind_ext_s(st->ld, NULL, NULL);
return (-1);
}
}
return (-1);
}
}
@@
-139,12
+141,13
@@
static int cldap_init_host(cldap_t *st) /* {{{ */
ERROR("openldap plugin: Failed to bind to %s: %s", st->url,
ldap_err2string(rc));
st->state = 0;
ERROR("openldap plugin: Failed to bind to %s: %s", st->url,
ldap_err2string(rc));
st->state = 0;
- ldap_unbind_ext_s(st->ld, NULL, NULL);
+ if (st->ld != NULL)
+ ldap_unbind_ext_s(st->ld, NULL, NULL);
return (-1);
} else {
DEBUG("openldap plugin: Successfully connected to %s", st->url);
st->state = 1;
return (-1);
} else {
DEBUG("openldap plugin: Successfully connected to %s", st->url);
st->state = 1;
- return
(0)
;
+ return
0
;
}
} /* }}} static cldap_init_host */
}
} /* }}} static cldap_init_host */
@@
-197,14
+200,14
@@
static int cldap_read_host(user_data_t *ud) /* {{{ */
if ((ud == NULL) || (ud->data == NULL)) {
ERROR("openldap plugin: cldap_read_host: Invalid user data.");
if ((ud == NULL) || (ud->data == NULL)) {
ERROR("openldap plugin: cldap_read_host: Invalid user data.");
- return
(-1)
;
+ return
-1
;
}
st = (cldap_t *)ud->data;
status = cldap_init_host(st);
if (status != 0)
}
st = (cldap_t *)ud->data;
status = cldap_init_host(st);
if (status != 0)
- return
(-1)
;
+ return
-1
;
rc = ldap_search_ext_s(st->ld, "cn=Monitor", LDAP_SCOPE_SUBTREE,
"(|(!(cn=* *))(cn=Database*))", attrs, 0, NULL, NULL,
rc = ldap_search_ext_s(st->ld, "cn=Monitor", LDAP_SCOPE_SUBTREE,
"(|(!(cn=* *))(cn=Database*))", attrs, 0, NULL, NULL,
@@
-214,7
+217,8
@@
static int cldap_read_host(user_data_t *ud) /* {{{ */
ERROR("openldap plugin: Failed to execute search: %s", ldap_err2string(rc));
ldap_msgfree(result);
st->state = 0;
ERROR("openldap plugin: Failed to execute search: %s", ldap_err2string(rc));
ldap_msgfree(result);
st->state = 0;
- ldap_unbind_ext_s(st->ld, NULL, NULL);
+ if (st->ld != NULL)
+ ldap_unbind_ext_s(st->ld, NULL, NULL);
return (-1);
}
return (-1);
}
@@
-310,8
+314,8
@@
static int cldap_read_host(user_data_t *ud) /* {{{ */
if ((olmbdb_list =
ldap_get_values_len(st->ld, e, "olmBDBEntryCache")) != NULL) {
olmbdb_data = *olmbdb_list[0];
if ((olmbdb_list =
ldap_get_values_len(st->ld, e, "olmBDBEntryCache")) != NULL) {
olmbdb_data = *olmbdb_list[0];
- s
s
nprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
-
nc_data.bv_val);
+ snprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
+ nc_data.bv_val);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
ldap_value_free_len(olmbdb_list);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
ldap_value_free_len(olmbdb_list);
@@
-320,8
+324,7
@@
static int cldap_read_host(user_data_t *ud) /* {{{ */
if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBDNCache")) !=
NULL) {
olmbdb_data = *olmbdb_list[0];
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);
+ snprintf(typeinst, sizeof(typeinst), "bdbdncache-%s", nc_data.bv_val);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
ldap_value_free_len(olmbdb_list);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
ldap_value_free_len(olmbdb_list);
@@
-330,8
+333,8
@@
static int cldap_read_host(user_data_t *ud) /* {{{ */
if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBIDLCache")) !=
NULL) {
olmbdb_data = *olmbdb_list[0];
if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBIDLCache")) !=
NULL) {
olmbdb_data = *olmbdb_list[0];
- s
s
nprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
-
nc_data.bv_val);
+ snprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
+ nc_data.bv_val);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
ldap_value_free_len(olmbdb_list);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
ldap_value_free_len(olmbdb_list);
@@
-372,7
+375,7
@@
static int cldap_read_host(user_data_t *ud) /* {{{ */
}
ldap_msgfree(result);
}
ldap_msgfree(result);
- return
(0)
;
+ return
0
;
} /* }}} int cldap_read_host */
/* Configuration handling functions {{{
} /* }}} int cldap_read_host */
/* Configuration handling functions {{{
@@
-393,13
+396,13
@@
static int cldap_config_add(oconfig_item_t *ci) /* {{{ */
st = calloc(1, sizeof(*st));
if (st == NULL) {
ERROR("openldap plugin: calloc failed.");
st = calloc(1, sizeof(*st));
if (st == NULL) {
ERROR("openldap plugin: calloc failed.");
- return
(-1)
;
+ return
-1
;
}
status = cf_util_get_string(ci, &st->name);
if (status != 0) {
sfree(st);
}
status = cf_util_get_string(ci, &st->name);
if (status != 0) {
sfree(st);
- return
(status)
;
+ return
status
;
}
st->starttls = 0;
}
st->starttls = 0;
@@
-476,25
+479,26
@@
static int cldap_config_add(oconfig_item_t *ci) /* {{{ */
databases[databases_num] = st;
databases_num++;
databases[databases_num] = st;
databases_num++;
- s
s
nprintf(callback_name, sizeof(callback_name), "openldap/%s/%s",
-
(st->host != NULL) ? st->host : hostname_g,
-
(st->name != NULL) ? st->name : "default");
+ snprintf(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,
status = plugin_register_complex_read(/* group = */ NULL,
/* name = */ callback_name,
/* callback = */ cldap_read_host,
- /* interval = */ 0, &(user_data_t){
- .data = st,
- });
+ /* interval = */ 0,
+ &(user_data_t){
+ .data = st,
+ });
}
}
if (status != 0) {
cldap_free(st);
}
}
if (status != 0) {
cldap_free(st);
- return
(-1)
;
+ return
-1
;
}
}
- return
(0)
;
+ return
0
;
} /* }}} int cldap_config_add */
static int cldap_config(oconfig_item_t *ci) /* {{{ */
} /* }}} int cldap_config_add */
static int cldap_config(oconfig_item_t *ci) /* {{{ */
@@
-514,7
+518,7
@@
static int cldap_config(oconfig_item_t *ci) /* {{{ */
child->key);
} /* for (ci->children) */
child->key);
} /* for (ci->children) */
- return
(status)
;
+ return
status
;
} /* }}} int cldap_config */
/* }}} End of configuration handling functions */
} /* }}} int cldap_config */
/* }}} End of configuration handling functions */
@@
-525,18
+529,18
@@
static int cldap_init(void) /* {{{ */
* ldap_initialize(3) */
int debug_level;
ldap_get_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug_level);
* ldap_initialize(3) */
int debug_level;
ldap_get_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug_level);
- return
(0)
;
+ return
0
;
} /* }}} int cldap_init */
static int cldap_shutdown(void) /* {{{ */
{
for (size_t i = 0; i < databases_num; i++)
} /* }}} int cldap_init */
static int cldap_shutdown(void) /* {{{ */
{
for (size_t i = 0; i < databases_num; i++)
- if (databases[i]->ld != NULL)
+ if (databases[i]
!= NULL && databases[i]
->ld != NULL)
ldap_unbind_ext_s(databases[i]->ld, NULL, NULL);
sfree(databases);
databases_num = 0;
ldap_unbind_ext_s(databases[i]->ld, NULL, NULL);
sfree(databases);
databases_num = 0;
- return
(0)
;
+ return
0
;
} /* }}} int cldap_shutdown */
void module_register(void) /* {{{ */
} /* }}} int cldap_shutdown */
void module_register(void) /* {{{ */