author | Florian Forster <octo@collectd.org> | |
Thu, 21 Sep 2017 15:26:23 +0000 (17:26 +0200) | ||
committer | Florian Forster <octo@collectd.org> | |
Thu, 21 Sep 2017 15:26:23 +0000 (17:26 +0200) |
1 | 2 | |||
---|---|---|---|---|
contrib/redhat/collectd.spec | patch | | diff1 | | diff2 | | blob | history |
src/network.c | patch | | diff1 | | diff2 | | blob | history |
src/ntpd.c | patch | | diff1 | | diff2 | | blob | history |
src/perl.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc contrib/redhat/collectd.spec
Simple merge
diff --cc src/network.c
index 375da84738dbbdec8d39fe177212e3086d4aeada,e28316d5385cc3e3cbaa9dec7b473654cdadc50d..4e684215ac732d36a593b9d2f870b011f60de707
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
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