[icinga-checkins] icinga.org: icinga-core/next: classic ui: fix cmd. cgi does not honor commandpipe location; overwrites from empty environment variable refs #3418

git at icinga.org git at icinga.org
Sat Nov 10 15:50:28 CET 2012


Module: icinga-core
Branch: next
Commit: 70253eff43d32f2bff0be1d9029416070d2bb925
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=70253eff43d32f2bff0be1d9029416070d2bb925

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Fri Nov  2 23:21:17 2012 +0100

classic ui: fix cmd.cgi does not honor commandpipe location; overwrites from empty environment variable refs #3418

---

 Changelog      |    2 ++
 cgi/cgiutils.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 4dc9a5c..f87bb0f 100644
--- a/Changelog
+++ b/Changelog
@@ -19,6 +19,8 @@ ENHANCEMENTS
 FIXES
 * core: fix faulty macro cleaning, replacing spaces with pluses where they shouldn't be cleaned #3397 - MF
 
+* classic ui: fix cmd.cgi does not honor commandpipe location; overwrites from empty environment variable #3418 - MF
+
 CHANGES
 
 
diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c
index 5ac6509..d12400f 100644
--- a/cgi/cgiutils.c
+++ b/cgi/cgiutils.c
@@ -346,7 +346,7 @@ char * get_cmd_file_location(void) {
 			/* stay compatible */
 			cmdloc = getenv("NAGIOS_COMMAND_FILE");
 			if (!cmdloc) {
-				cmdloc = DEFAULT_COMMAND_FILE;
+				cmdloc = command_file;
 			}
 		}
 	}





More information about the icinga-checkins mailing list