ERROR("openldap plugin: Failed to start tls on %s: %s", st->url,
ldap_err2string(rc));
st->state = 0;
-<<<<<<< HEAD
- ldap_unbind_ext_s(st->ld, NULL, NULL);
- return -1;
-=======
if (st->ld != NULL)
ldap_unbind_ext_s(st->ld, NULL, NULL);
return (-1);
->>>>>>> collectd-5.7
}
}
ERROR("openldap plugin: Failed to bind to %s: %s", st->url,
ldap_err2string(rc));
st->state = 0;
-<<<<<<< HEAD
- ldap_unbind_ext_s(st->ld, NULL, NULL);
- return -1;
-=======
if (st->ld != NULL)
ldap_unbind_ext_s(st->ld, NULL, NULL);
return (-1);
->>>>>>> collectd-5.7
} else {
DEBUG("openldap plugin: Successfully connected to %s", st->url);
st->state = 1;
ERROR("openldap plugin: Failed to execute search: %s", ldap_err2string(rc));
ldap_msgfree(result);
st->state = 0;
-<<<<<<< HEAD
- ldap_unbind_ext_s(st->ld, NULL, NULL);
- return -1;
-=======
if (st->ld != NULL)
ldap_unbind_ext_s(st->ld, NULL, NULL);
return (-1);
->>>>>>> collectd-5.7
}
for (LDAPMessage *e = ldap_first_entry(st->ld, result); e != NULL;
if ((olmbdb_list =
ldap_get_values_len(st->ld, e, "olmBDBEntryCache")) != NULL) {
olmbdb_data = *olmbdb_list[0];
- ssnprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
+ snprintf(typeinst, sizeof(typeinst), "bdbentrycache-%s",
nc_data.bv_val);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBDNCache")) !=
NULL) {
olmbdb_data = *olmbdb_list[0];
- ssnprintf(typeinst, sizeof(typeinst), "bdbdncache-%s",
+ snprintf(typeinst, sizeof(typeinst), "bdbdncache-%s",
nc_data.bv_val);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
if ((olmbdb_list = ldap_get_values_len(st->ld, e, "olmBDBIDLCache")) !=
NULL) {
olmbdb_data = *olmbdb_list[0];
- ssnprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
+ snprintf(typeinst, sizeof(typeinst), "bdbidlcache-%s",
nc_data.bv_val);
cldap_submit_gauge("cache_size", typeinst, atoll(olmbdb_data.bv_val),
st);
databases[databases_num] = st;
databases_num++;
- ssnprintf(callback_name, sizeof(callback_name), "openldap/%s/%s",
+ snprintf(callback_name, sizeof(callback_name), "openldap/%s/%s",
(st->host != NULL) ? st->host : hostname_g,
(st->name != NULL) ? st->name : "default");