Code

Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 15:26:23 +0000 (17:26 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 15:26:23 +0000 (17:26 +0200)
1  2 
contrib/redhat/collectd.spec
src/network.c
src/ntpd.c
src/perl.c

Simple merge
diff --cc src/network.c
index 375da84738dbbdec8d39fe177212e3086d4aeada,e28316d5385cc3e3cbaa9dec7b473654cdadc50d..4e684215ac732d36a593b9d2f870b011f60de707
@@@ -1230,10 -1230,10 +1230,10 @@@ static int parse_part_encr_aes256(socke
                              part_size - buffer_offset,
                              /* in = */ NULL, /* in len = */ 0);
    if (err != 0) {
-     sfree(pea.username);
      ERROR("network plugin: gcry_cipher_decrypt returned: %s. Username: %s",
            gcry_strerror(err), pea.username);
 -    return (-1);
+     sfree(pea.username);
 +    return -1;
    }
  
    /* Read the hash */
diff --cc src/ntpd.c
Simple merge
diff --cc src/perl.c
Simple merge