From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 30 Jun 2017 14:20:16 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~145
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5ff74d56067ac64db801df5184eb8b97f4b2b645;p=collectd.git

Merge branch 'collectd-5.7'

Conflicts:
	src/openldap.c
---

5ff74d56067ac64db801df5184eb8b97f4b2b645
diff --cc src/exec.c
index f10b816b,28380ac3..80515d93
--- a/src/exec.c
+++ b/src/exec.c
@@@ -369,10 -369,10 +369,10 @@@ static int fork_child(program_list_t *p
  
    struct passwd *sp_ptr;
    struct passwd sp;
-   char nambuf[2048];
+   char nambuf[4096];
  
    if (pl->pid != 0)
 -    return (-1);
 +    return -1;
  
    if ((create_pipe(fd_pipe_in) == -1) || (create_pipe(fd_pipe_out) == -1) ||
        (create_pipe(fd_pipe_err) == -1))
diff --cc src/openldap.c
index 1156169c,50757db8..7aa8c392
--- a/src/openldap.c
+++ b/src/openldap.c
@@@ -119,8 -120,9 +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;
++<<<<<<< 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
      }
    }
  
@@@ -139,8 -141,9 +146,14 @@@
      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;
@@@ -214,8 -217,9 +227,14 @@@ static int cldap_read_host(user_data_t 
      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;