From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 30 Jun 2017 14:53:12 +0000 (+0200)
Subject: Fix mismerge
X-Git-Tag: collectd-5.8.0~143
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=65ca7b983d12caf81abb19d23bff069bbcca33c7;p=collectd.git

Fix mismerge
---

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;