Merge branch 'ndoutils-2.1.1-RC1'

NagiosEnterprises · Sep 6, 2016 · 07566e2 · 07566e2
2 parents a83b189 + 6ce85ca
commit 07566e2
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git a/Changelog b/Changelog
@@ -2,6 +2,15 @@
 NDO Utils Changelog
 ===================
 
+2.1.x - 2016-xx-xx
+------------------
+* Changed version number from '2.1' to '2.1.0' (John Frickson)
+* startup/default-init.in needed a default _set_rc function (John Frickson)
+* Removed the alpha/beta quality warning from README (John Frickson)
+* Fixed a segfault in ndomod when nagios is reloaded (SIGHUP) (John Frickson)
+* /usr/lib/tmpfiles.d/ndo2db.conf should have 'd' type, not 'D' (John Frickson)
+
+
 2.1.0 - 2016-08-01
 ------------------
 * Probable fix for ndo2db not responding & growing queue issue (John Frickson)

diff --git a/README b/README
@@ -3,16 +3,6 @@ NDO README
 ----------
 
 
-***************
-!! IMPORTANT !!
-***************
-This code is still an alpha/beta quality, so expect problems if you intend to use
-it.  Make sure that you aren't using it with your only production installation of
-Nagios, or it could take down the Nagios process if the NDOMOD module segfaults.
-Nagios could segfault silently and you might never know that Nagios crashed...
-
-
-
 ****************
 ABOUT THIS ADDON
 ****************

diff --git a/configure b/configure
@@ -2464,9 +2464,9 @@ $as_echo "#define DEFAULT_NAGIOS_GROUP nagios" >>confdefs.h
 
 PKG_NAME=ndoutils
 INIT_PROG=ndo2db
-PKG_VERSION="2.1"
+PKG_VERSION="2.1.1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="07-28-2016"
+PKG_REL_DATE="09-06-2016"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

diff --git a/configure.ac b/configure.ac
@@ -30,9 +30,9 @@ AC_DEFINE([DEFAULT_NAGIOS_GROUP], [nagios], [Default Nagios Group])
 
 PKG_NAME=ndoutils
 INIT_PROG=ndo2db
-PKG_VERSION="2.1"
+PKG_VERSION="2.1.1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="07-28-2016"
+PKG_REL_DATE="09-06-2016"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL

diff --git a/src/file2sock.c b/src/file2sock.c
@@ -10,7 +10,7 @@
  * License: GPL v2
  *
  * First Written: 05-13-2005
- * Last Modified: 07-28-2016
+ * Last Modified: 09-06-2016
  *
  * This file is part of NDOUtils.
  *
@@ -31,9 +31,9 @@
 #include "../include/common.h"
 #include "../include/io.h"
 
-#define FILE2SOCK_VERSION "2.1"
+#define FILE2SOCK_VERSION "2.1.1"
 #define FILE2SOCK_NAME "FILE2SOCK"
-#define FILE2SOCK_DATE "07-28-2016"
+#define FILE2SOCK_DATE "09-06-2016"
 
 
 int process_arguments(int,char **);

diff --git a/src/log2ndo.c b/src/log2ndo.c
@@ -5,7 +5,7 @@
  * Copyright 2009-2014 Nagios Core Development Team and Community Contributors
  * Copyright 2005-2009 Ethan Galstad
  *
- * Last Modified: 07-28-2016
+ * Last Modified: 09-06-2016
  *
  * This file is part of NDOUtils.
  *
@@ -27,9 +27,9 @@
 #include "../include/io.h"
 #include "../include/protoapi.h"
 
-#define LOG2NDO_VERSION "2.1"
+#define LOG2NDO_VERSION "2.1.1"
 #define LOG2NDO_NAME "LOG2NDO"
-#define LOG2NDO_DATE "07-28-2016"
+#define LOG2NDO_DATE "09-06-2016"
 
 
 

diff --git a/src/ndo2db.c b/src/ndo2db.c
@@ -6,7 +6,7 @@
  * Copyright 2005-2009 Ethan Galstad
  *
  * First Written: 05-19-2005
- * Last Modified: 07-28-2016
+ * Last Modified: 09-06-2016
  *
  * This file is part of NDOUtils.
  *
@@ -50,9 +50,9 @@
 
 #include <pthread.h>
 
-#define NDO2DB_VERSION "2.1"
+#define NDO2DB_VERSION "2.1.1"
 #define NDO2DB_NAME "NDO2DB"
-#define NDO2DB_DATE "07-28-2016"
+#define NDO2DB_DATE "09-06-2016"
 
 #ifdef HAVE_SSL
 # if (defined(__sun) && defined(SOLARIS_10)) || defined(_AIX) || defined(__hpux)

diff --git a/src/ndomod.c b/src/ndomod.c
@@ -5,12 +5,12 @@
  * Copyright 2009-2014 Nagios Core Development Team and Community Contributors
  * Copyright 2005-2009 Ethan Galstad
  *
- * Last Modified: 02-28-2014
+ * Last Modified: 09-06-2016
  *
  * This file is part of NDOUtils.
  *
  * First Written: 05-19-2005
- * Last Modified: 07-28-2016
+ * Last Modified: 09-06-2016
  *
  *****************************************************************************
  * NDOUtils is free software: you can redistribute it and/or modify
@@ -86,9 +86,9 @@
 NEB_API_VERSION(CURRENT_NEB_API_VERSION)
 
 
-#define NDOMOD_VERSION "2.1"
+#define NDOMOD_VERSION "2.1.1"
 #define NDOMOD_NAME "NDOMOD"
-#define NDOMOD_DATE "07-28-2016"
+#define NDOMOD_DATE "09-06-2016"
 
 #define BD_INT				0
 #define BD_TIMEVAL			1
@@ -1807,9 +1807,9 @@ int ndomod_broker_data(int event_type, void *data){
 
 	case NEBCALLBACK_PROCESS_DATA:
 
-		ndomod_write_active_objects();
-
 		procdata=(nebstruct_process_data *)data;
+		if (procdata->type == NEBTYPE_PROCESS_START)
+			ndomod_write_active_objects();
 
 		{
 			struct ndo_broker_data process_data[] = {

diff --git a/src/sockdebug.c b/src/sockdebug.c
@@ -9,7 +9,7 @@
  * Copyright (c) 2005-2009 Ethan Galstad
  *
  * First Written: 05-13-2005
- * Last Modified: 07-28-2016
+ * Last Modified: 09-06-2016
  *
  * This file is part of NDOUtils.
  *
@@ -28,9 +28,9 @@
 
 #include "../include/config.h"
 
-#define SOCKDEBUG_VERSION "2.1"
+#define SOCKDEBUG_VERSION "2.1.1"
 #define SOCKDEBUG_NAME "SOCKDEBUG"
-#define SOCKDEBUG_DATE "07-28-2016"
+#define SOCKDEBUG_DATE "09-06-2016"
 
 
 int cleanup_socket(int,char *);

diff --git a/startup/default-init.in b/startup/default-init.in
@@ -41,6 +41,7 @@ STAT_MSG="echo -n Checking for ndo2db daemon... "
 STAT_CMD="status ndo2db"
 EXIT_CMD="exit"
 
+_set_rc (){ return; }
 
 # Source the function library
 if [ -f /etc/rc.status ]; then

diff --git a/startup/tmpfile.conf.in b/startup/tmpfile.conf.in
@@ -1,2 +1,2 @@
 #Type	Path			Mode	UID				GID				Age	Argument
-D		@piddir@	0755	@ndo2db_user@	@ndo2db_group@	-	-
+d		@piddir@	0755	@ndo2db_user@	@ndo2db_group@	-	-
diff --git a/update-version b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=2.1
+CURRENTVERSION=2.1.1
 
 # Last date
-LASTDATE=07-28-2016
+LASTDATE=09-06-2016
 
 if [ "x$1" = "x" ]
 then