projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.7'
[collectd.git]
/
src
/
openldap.c
diff --git
a/src/openldap.c
b/src/openldap.c
index
1156169
..
7aa8c39
100644
(file)
--- a/
src/openldap.c
+++ b/
src/openldap.c
@@
-92,8
+92,9
@@
static int cldap_init_host(cldap_t *st) /* {{{ */
if (rc != LDAP_SUCCESS) {
ERROR("openldap plugin: ldap_initialize failed: %s", ldap_err2string(rc));
st->state = 0;
if (rc != LDAP_SUCCESS) {
ERROR("openldap plugin: ldap_initialize failed: %s", ldap_err2string(rc));
st->state = 0;
- ldap_unbind_ext_s(ld, NULL, NULL);
- return -1;
+ if (ld != NULL)
+ ldap_unbind_ext_s(ld, NULL, NULL);
+ return (-1);
}
st->ld = ld;
}
st->ld = ld;
@@
-119,8
+120,14
@@
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;
+<<<<<<< HEAD
ldap_unbind_ext_s(st->ld, NULL, NULL);
return -1;
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
}
}
}
}
@@
-139,8
+146,14
@@
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;
+<<<<<<< HEAD
ldap_unbind_ext_s(st->ld, NULL, NULL);
return -1;
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;
} else {
DEBUG("openldap plugin: Successfully connected to %s", st->url);
st->state = 1;
@@
-214,8
+227,14
@@
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;
+<<<<<<< HEAD
ldap_unbind_ext_s(st->ld, NULL, NULL);
return -1;
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;
}
for (LDAPMessage *e = ldap_first_entry(st->ld, result); e != NULL;