[checkmk-commits] Check_MK Git: check_mk: Fix invalid path to inventory files after reload

Module: check_mk Branch: master Commit: 66ce1c93deb902381606e265abd049297e112966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66ce1c93deb902… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Nov 17 14:45:20 2014 +0100 Fix invalid path to inventory files after reload --- livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/HostFileColumn.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index d38b92d..b876313 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -65,7 +65,7 @@ char *HostFileColumn::getBlob(void *data, int *size) #endif char path[4096]; - snprintf(path, sizeof(path), "%s/%s%s", _base_dir, host_name, _suffix); + snprintf(path, sizeof(path), "%s/%s%s", _base_dir.c_str(), host_name, _suffix.c_str()); int fd = open(path, O_RDONLY); if (fd < 0) { return 0; diff --git a/livestatus/src/HostFileColumn.h b/livestatus/src/HostFileColumn.h index 04fdadd..11ae20a 100644 --- a/livestatus/src/HostFileColumn.h +++ b/livestatus/src/HostFileColumn.h @@ -29,10 +29,10 @@ class HostFileColumn : public BlobColumn { - const char *_base_dir; - const char *_suffix; + string _base_dir; + string _suffix; public: - HostFileColumn(string name, string description, const char *base_dir, + HostFileColumn(string name, string description, const char *base_dir, const char *suffice, int indirect_offset); // returns a buffer to be freed afterwards!!