[checkmk-commits] Check_MK Git: check_mk: livecheck: fixed handling of one-line plugin outputs and missing \n

Module: check_mk Branch: master Commit: 7078ea7ae796b22c811a8fd805b5aa8647f30c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7078ea7ae796b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 28 18:17:18 2013 +0200 livecheck: fixed handling of one-line plugin outputs and missing \n Conflicts: ChangeLog --- ChangeLog | 5 +++++ livestatus/src/livecheck.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index e6faeb4..005d64d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Multisite: * User accounts can now be locked after a specified amount of auth failures (lock_on_logon_failures can be set to a number of tries) + * FIX: better error message in case of exception in SNMP handling Checks & Agents: * lnx_if: Fixed crash on missing "Address" field @@ -149,6 +150,10 @@ 1.2.2p2: + Core: + * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n + (Thanks to Florent Peterschmitt) + Checks & Agents: * FIX: jolokia_info: ignore ERROR instances * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 0527b58..b295507 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -235,6 +235,9 @@ int main(int argc, char **argv) break; ptr_walk++; } + if(*ptr_output) { + fputs(ptr_output, checkfile); + } fputs("\n", checkfile); fchown(fd, real_uid, real_gid);