Title: [opsview-base] [239] Merge of 237: nagvis issue for nagios_programstatus
- Revision
- 239
- Author
- tvoon
- Date
- 2013-04-08 10:21:18 +0100 (Mon, 08 Apr 2013)
Log Message
Merge of 237: nagvis issue for nagios_programstatus
Modified Paths
Added Paths
Property Changed
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BRAN-4.2:152
/branches/BRAN-4.3:54-62
/branches/DEV-Nagios_4:63-125
/branches/DEV-Nagios_4-will_need_to_merge:77-148
/branches/nagvis-iframe:33
+ /branches/BRAN-4.2:152
/branches/BRAN-4.3:54-62,237
/branches/DEV-Nagios_4:63-125
/branches/DEV-Nagios_4-will_need_to_merge:77-148
/branches/nagvis-iframe:33
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2013-04-05 09:17:09 UTC (rev 238)
+++ trunk/Makefile 2013-04-08 09:21:18 UTC (rev 239)
@@ -833,6 +833,7 @@
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_statedata_with_acks_downtime.patch
# cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_performance_improvement_for_object_lookup.patch
cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_with_fixed_multiple_newlines_at_end.patch
+ cd ${NDOUTILS} && patch -p1 < ../patches/ndoutils_fix_nagvis_issue_with_programstatus.patch
# cd ${NDOUTILS} && aclocal -I m4 && autoconf
# #cp patches/ndoutils_upgradedb.pl ${NDOUTILS}/db/upgradedb.pl
# #cp patches/ndoutils_mysql-upgrade-1.4b3.sql ${NDOUTILS}/db/mysql-upgrade-1.4b3.sql
Copied: trunk/patches/ndoutils_fix_nagvis_issue_with_programstatus.patch (from rev 237, branches/BRAN-4.3/patches/ndoutils_fix_nagvis_issue_with_programstatus.patch)
===================================================================
--- trunk/patches/ndoutils_fix_nagvis_issue_with_programstatus.patch (rev 0)
+++ trunk/patches/ndoutils_fix_nagvis_issue_with_programstatus.patch 2013-04-08 09:21:18 UTC (rev 239)
@@ -0,0 +1,12 @@
+diff -ur ndoutils-2-0.original//src/ndomod.c ndoutils-2-0/src/ndomod.c
+--- ndoutils-2-0.original//src/ndomod.c 2013-03-22 14:36:41.000000000 +0000
++++ ndoutils-2-0/src/ndomod.c 2013-04-03 18:15:39.000000000 +0000
+@@ -2243,7 +2243,7 @@
+ ,psdata->daemon_mode
+ ,NDO_DATA_LASTCOMMANDCHECK
+ #ifdef BUILD_NAGIOS_4X
+- ,0
++ ,(unsigned long)0 // This needs to be set to unsigned long, otherwise random errors may appear
+ #else
+ ,(unsigned long)psdata->last_command_check
+ #endif
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
