[pkg-nagios-changes] [Git][nagios-team/nsca][upstream] New upstream version 2.10.3
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri Aug 2 08:19:23 BST 2024
Bas Couwenberg pushed to branch upstream at Debian Nagios Maintainer Group / nsca
Commits:
195c3e75 by Bas Couwenberg at 2024-08-02T09:11:53+02:00
New upstream version 2.10.3
- - - - -
9 changed files:
- CHANGELOG.md
- CONTRIBUTORS.md
- configure
- configure.ac
- include/common.h
- nsca.spec
- src/nsca.c
- src/send_nsca.c
- update-version
Changes:
=====================================
CHANGELOG.md
=====================================
@@ -1,6 +1,11 @@
NSCA Changelog
==============
+2.10.3 - 2024-08-01
+-------------------
+ * Allow NSCA to bind to the loopback address (Imre Jonk)
+ * Improved clarity of error when running in the foreground while already running in the background (Griffin Westerman)
+
2.10.2 - 2022-06-06
-------------------
* Fixed exiting with STATE_OK when no packets were successfully sent
=====================================
CONTRIBUTORS.md
=====================================
@@ -28,3 +28,6 @@ A full list of authors, contributors, and maintainers is as follows:
* Ralf Ertzinger
* David Luyer
* Jay McCarthy
+ * Griffin Westerman (Nagios)
+ * Imre Jonk
+
=====================================
configure
=====================================
@@ -2367,9 +2367,9 @@ ac_config_files="$ac_config_files Makefile subst src/Makefile package/solaris/Ma
PKG_NAME=nsca
-PKG_VERSION="2.10.2"
+PKG_VERSION="2.10.3"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="2022-06-06"
+PKG_REL_DATE="2024-08-01"
=====================================
configure.ac
=====================================
@@ -4,7 +4,7 @@ dnl Disable caching
define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)
-AC_INIT([nsca],[2.10.2],[nagios-users at lists.sourceforge.net],[nsca],[http://www.nagios.org])
+AC_INIT([nsca],[2.10.3],[nagios-users at lists.sourceforge.net],[nsca],[http://www.nagios.org])
AC_CONFIG_SRCDIR([src/nsca.c])
AC_CONFIG_HEADER(include/config.h)
AC_CONFIG_FILES([Makefile
@@ -19,9 +19,9 @@ AC_CONFIG_FILES([Makefile
AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nsca
-PKG_VERSION="2.10.2"
+PKG_VERSION="2.10.3"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="2022-06-06"
+PKG_REL_DATE="2024-08-01"
AC_SUBST(PKG_NAME)
AC_SUBST(PKG_VERSION)
AC_SUBST(PKG_HOME_URL)
=====================================
include/common.h
=====================================
@@ -2,7 +2,7 @@
*
* COMMON.H - NSCA Common Include File
* Copyright (c) 1999-2003 Ethan Galstad (nagios at nagios.org)
- * Last Modified: 2022-06-06
+ * Last Modified: 2024-08-01
*
* License:
*
@@ -24,8 +24,8 @@
#include "config.h"
-#define PROGRAM_VERSION "2.10.2"
-#define MODIFICATION_DATE "2022-06-06"
+#define PROGRAM_VERSION "2.10.3"
+#define MODIFICATION_DATE "2024-08-01"
#define OK 0
=====================================
nsca.spec
=====================================
@@ -1,5 +1,5 @@
%define name nsca
-%define version 2.10.2
+%define version 2.10.3
%define release 1
%define nsusr nagios
%define nsgrp nagios
=====================================
src/nsca.c
=====================================
@@ -5,7 +5,7 @@
* Copyright (c) 2000-2009 Ethan Galstad (egalstad at nagios.org)
* License: GPL v2
*
- * Last Modified: 2022-06-06
+ * Last Modified: 2024-08-01
*
* Command line: NSCA -c <config_file> [mode]
*
@@ -225,15 +225,17 @@ int main(int argc, char **argv){
signal(SIGHUP,sighandler);
#endif /* HAVE_SIGACTION */
- /* close standard file descriptors */
- close(0);
- close(1);
- close(2);
+ if (!foreground) {
+ /* close standard file descriptors */
+ close(0);
+ close(1);
+ close(2);
- /* redirect standard descriptors to /dev/null */
- open("/dev/null",O_RDONLY);
- open("/dev/null",O_WRONLY);
- open("/dev/null",O_WRONLY);
+ /* redirect standard descriptors to /dev/null */
+ open("/dev/null",O_RDONLY);
+ open("/dev/null",O_WRONLY);
+ open("/dev/null",O_WRONLY);
+ }
/* get group information before chrooting */
get_user_info(nsca_user,&uid);
@@ -842,7 +844,7 @@ static void wait_for_connections(void) {
/* what address should we bind to? */
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
- hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE;
+ hints.ai_flags = AI_PASSIVE;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
if (v6ok && sa == NULL) {
@@ -1685,6 +1687,7 @@ static int write_pid_file(uid_t usr, gid_t grp){
/* previous process is still running */
else{
+ if (foreground) printf("There's already an NSCA server running (PID %lu). Bailing out...\n",(unsigned long)pid);
syslog(LOG_ERR,"There's already an NSCA server running (PID %lu). Bailing out...",(unsigned long)pid);
return ERROR;
}
=====================================
src/send_nsca.c
=====================================
@@ -4,7 +4,7 @@
* License: GPL v2
* Copyright (c) 2000-2007 Ethan Galstad (nagios at nagios.org)
*
- * Last Modified: 2022-06-06
+ * Last Modified: 2024-08-01
*
* Command line: SEND_NSCA <host_address> [-p port] [-to to_sec] [-c config_file]
*
=====================================
update-version
=====================================
@@ -10,10 +10,10 @@ else
fi
# Current version number
-CURRENTVERSION=2.10.2
+CURRENTVERSION=2.10.3
# Last date
-LASTDATE=2022-06-06
+LASTDATE=2024-08-01
if [ "x$1" = "x" ]
then
View it on GitLab: https://salsa.debian.org/nagios-team/nsca/-/commit/195c3e7512e901297b3b1bd1811e9a026d27689d
--
View it on GitLab: https://salsa.debian.org/nagios-team/nsca/-/commit/195c3e7512e901297b3b1bd1811e9a026d27689d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20240802/6a3c5552/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list