Title: [opsview-base] [233] fix code 7
- Revision
- 233
- Author
- aburzynski
- Date
- 2013-03-27 17:55:32 +0000 (Wed, 27 Mar 2013)
Log Message
fix code 7
Modified Paths
Added Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-03-25 13:23:58 UTC (rev 232)
+++ trunk/Makefile 2013-03-27 17:55:32 UTC (rev 233)
@@ -616,6 +616,7 @@
cd ${NAGIOS} && patch -p1 < ../patches/nagios_bugfix_2637_to_2640.patch
cd ${NAGIOS} && patch -p0 < ../patches/nagios_tilda_in_commands_execute_via_shell.patch
cd ${NAGIOS} && patch -p0 < ../patches/nagios_bugfix_2650_2651.patch
+ cd ${NAGIOS} && patch -p1 < ../patches/nagios_code7_fix.patch
if [ $(KERNEL_NAME) = Linux ] ; then \
cd ${NAGIOS} && CFLAGS="${CFLAGS}" ./configure --with-nagios-user=$(NAGIOS_USER) --with-nagios-group=$(NAGIOS_GROUP) --with-command-group=$(NAGIOS_GROUP) --with-cgiurl=/cgi-bin --with-htmurl=/ --enable-libtap ; \
elif [ $(KERNEL_NAME) = Darwin ] ; then \
Added: trunk/patches/nagios_code7_fix.patch
===================================================================
--- trunk/patches/nagios_code7_fix.patch (rev 0)
+++ trunk/patches/nagios_code7_fix.patch 2013-03-27 17:55:32 UTC (rev 233)
@@ -0,0 +1,22 @@
+diff -ur nagios-4.0.20130107/lib/worker.c nagios-4.0.20130107.code7-fix//lib/worker.c
+--- nagios-4.0.20130107/lib/worker.c 2013-03-27 17:30:47.000000000 +0000
++++ nagios-4.0.20130107.code7-fix//lib/worker.c 2013-03-27 17:30:25.000000000 +0000
+@@ -261,9 +261,15 @@
+ struct key_value *kv = &cp->request->kv[i];
+ /* skip environment macros */
+ if (kv->key_len == 3 && !strcmp(kv->key, "env")) {
+- char *var = strtok(kv->value, "=");
+- unsetenv(var);
+- continue;
++ char *eq = strchr(kv->value, '=');
++ if ( eq == NULL ) continue;
++ size_t index = eq - kv->value;
++ char * var = malloc(index+1);
++ strncpy(var, kv->value, index);
++ var[index] = '\0';
++ unsetenv(var);
++ free(var);
++ continue;
+ }
+ kvvec_addkv_wlen(&resp, kv->key, kv->key_len, kv->value, kv->value_len);
+ }
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
