X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenldap.c;h=8053929015935ca6e2be51a66f09484c05803ef0;hb=b2ea1d933eb97c6dbbf523540bbc072db961eb9b;hp=7aa8c39278ec009166d4b605ee33084b79e6f30e;hpb=5ff74d56067ac64db801df5184eb8b97f4b2b645;p=collectd.git

diff --git a/src/openldap.c b/src/openldap.c
index 7aa8c392..80539290 100644
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -120,14 +120,9 @@ 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;
-<<<<<<< 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
     }
   }
 
@@ -146,14 +141,9 @@ 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;
-<<<<<<< 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;
@@ -227,14 +217,9 @@ 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;
-<<<<<<< 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;