[Pkg-nagios-changes] [pkg-nrpe] 22/41: Imported Upstream version 3.0.1
Bas Couwenberg
sebastic at debian.org
Sun Dec 4 17:53:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pkg-nrpe.
commit 5b09d0598ccfabe59e24c2928bbd597c8dd715c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 4 15:37:02 2016 +0100
Imported Upstream version 3.0.1
---
Changelog | 15 ++++++++-
Makefile.in | 20 +++++++-----
configure | 26 +++++++--------
configure.ac | 6 ++--
include/common.h.in | 6 ++--
nrpe.spec.in | 81 +++++++++++------------------------------------
sample-config/nrpe.cfg.in | 18 +++++------
src/Makefile.in | 39 ++++++++---------------
src/acl.c | 31 ++++++++----------
src/check_nrpe.c | 2 +-
src/nrpe.c | 2 +-
startup/default-init.in | 1 +
startup/default-xinetd.in | 2 +-
startup/tmpfile.conf.in | 2 +-
update-version | 4 +--
15 files changed, 106 insertions(+), 149 deletions(-)
diff --git a/Changelog b/Changelog
index 14bbcff..c3afddf 100644
--- a/Changelog
+++ b/Changelog
@@ -2,7 +2,20 @@
NRPE Changelog
**************
-3.0 = xx/xx/xxxx
+3.0.1 - 2016-09-08
+------------------
+FIXES
+- _set_rc: command not found reported by init script (John Frickson)
+- Version string contains name (John Frickson)
+- Changes to get 'rpmbuild' to work - nrpe.spec file outdated (John Frickson)
+- typo in startup/default-xinetd.in (Philippe Kueck)
+- debug output missing command name (Philippe Kueck)
+- /usr/lib/tmpfiles.d/ndo2db.conf should have 'd' type, not 'D' (John Frickson)
+- Fixes in parse_allowed_hosts() and called functions (Jobst Schmalenbach / John Frickson)
+- nrpe.cfg: 'debug' statement needs to be first in file (Jobst Schmalenbach / John Frickson)
+
+
+3.0 - 2016-08-01
-----------------
SECURITY
- Fix for CVE-2014-2913
diff --git a/Makefile.in b/Makefile.in
index e8c9538..4fb42f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,9 @@
SRC_BASE=./src/
SRC_INCLUDE=./include/
+# Mainly used for rpmbuild
+# DESTDIR=
+
CC=@CC@
CFLAGS=@CFLAGS@ @DEFS@
LDFLAGS=@LDFLAGS@ @LIBS@
@@ -17,12 +20,12 @@ INSTALL=@INSTALL@
GREP=@GREP@
EGREP=@EGREP@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-CFGDIR=@pkgsysconfdir@
-BINDIR=@bindir@
-SBINDIR=@sbindir@
-LIBEXECDIR=@libexecdir@
+prefix=$(DESTDIR)@prefix@
+exec_prefix=$(DESTDIR)@exec_prefix@
+CFGDIR=$(DESTDIR)@pkgsysconfdir@
+BINDIR=$(DESTDIR)@bindir@
+SBINDIR=$(DESTDIR)@sbindir@
+LIBEXECDIR=$(DESTDIR)@libexecdir@
NAGIOS_INSTALL_OPTS=@NAGIOS_INSTALL_OPTS@
NRPE_INSTALL_OPTS=@NRPE_INSTALL_OPTS@
OPSYS=@opsys@
@@ -33,11 +36,11 @@ NAGIOS_USER=@nagios_user@
NAGIOS_GROUP=@nagios_group@
INIT_TYPE=@init_type@
-INIT_DIR=@initdir@
+INIT_DIR=$(DESTDIR)@initdir@
INIT_OPTS=-o root -g root
INIT_FILE=@initname@
INETD_TYPE=@inetd_type@
-INETD_DIR=@inetddir@
+INETD_DIR=$(DESTDIR)@inetddir@
INETD_FILE=@inetdname@
SRC_INETD=@src_inetd@
SRC_INIT=@src_init@
@@ -186,6 +189,7 @@ distclean: clean
rm -f startup/newbsd-init startup/openbsd-init startup/openrc-conf
rm -f startup/openrc-init startup/rh-upstart-init startup/solaris-init.xml
rm -f startup/solaris-inetd.xml startup/tmpfile.conf startup/upstart-init
+ rm -f nrpe.spec uninstall include/common.h
rm -f Makefile
devclean: distclean
diff --git a/configure b/configure
index 6c9b491..a5dc351 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nrpe nrpe-3.0.
+# Generated by GNU Autoconf 2.69 for nrpe 3.0.1.
#
# Report bugs to <nagios-users at lists.sourceforge.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='nrpe'
PACKAGE_TARNAME='nrpe'
-PACKAGE_VERSION='nrpe-3.0'
-PACKAGE_STRING='nrpe nrpe-3.0'
+PACKAGE_VERSION='3.0.1'
+PACKAGE_STRING='nrpe 3.0.1'
PACKAGE_BUGREPORT='nagios-users at lists.sourceforge.net'
PACKAGE_URL='https://www.nagios.org/downloads/nagios-core-addons/'
@@ -1318,7 +1318,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures nrpe nrpe-3.0 to adapt to many kinds of systems.
+\`configure' configures nrpe 3.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1368,7 +1368,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of nrpe nrpe-3.0:";;
+ short | recursive ) echo "Configuration of nrpe 3.0.1:";;
esac
cat <<\_ACEOF
@@ -1513,7 +1513,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-nrpe configure nrpe-3.0
+nrpe configure 3.0.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2119,7 +2119,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by nrpe $as_me nrpe-3.0, which was
+It was created by nrpe $as_me 3.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2484,9 +2484,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
PKG_NAME=nrpe
-PKG_VERSION="nrpe-3.0"
+PKG_VERSION="3.0.1"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="07-12-2016"
+PKG_REL_DATE="09-08-2016"
RPM_RELEASE=1
LANG=C
@@ -4332,7 +4332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by nrpe $as_me nrpe-3.0, which was
+This file was extended by nrpe $as_me 3.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4386,7 +4386,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-nrpe config.status nrpe-3.0
+nrpe config.status 3.0.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -8257,7 +8257,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by nrpe $as_me nrpe-3.0, which was
+This file was extended by nrpe $as_me 3.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8320,7 +8320,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-nrpe config.status nrpe-3.0
+nrpe config.status 3.0.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 8b00d38..47760b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,15 +5,15 @@ define([AC_CACHE_LOAD],)
define([AC_CACHE_SAVE],)
m4_include([build-aux/custom_help.m4])
-AC_INIT([nrpe],[nrpe-3.0],[nagios-users at lists.sourceforge.net],[nrpe],[https://www.nagios.org/downloads/nagios-core-addons/])
+AC_INIT([nrpe],[3.0.1],[nagios-users at lists.sourceforge.net],[nrpe],[https://www.nagios.org/downloads/nagios-core-addons/])
AC_CONFIG_SRCDIR([src/nrpe.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nrpe
-PKG_VERSION="nrpe-3.0"
+PKG_VERSION="3.0.1"
PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="07-12-2016"
+PKG_REL_DATE="09-08-2016"
RPM_RELEASE=1
LANG=C
diff --git a/include/common.h.in b/include/common.h.in
index ec24364..38d93c2 100644
--- a/include/common.h.in
+++ b/include/common.h.in
@@ -2,7 +2,7 @@
*
* COMMON.H - NRPE Common Include File
* Copyright (c) 1999-2007 Ethan Galstad (nagios at nagios.org)
- * Last Modified: 07-12-2016
+ * Last Modified: 09-08-2016
*
* License:
*
@@ -27,8 +27,8 @@
#include <@SSL_INC_PREFIX@@SSL_HDR@>
#endif
-#define PROGRAM_VERSION "nrpe-3.0"
-#define MODIFICATION_DATE "07-12-2016"
+#define PROGRAM_VERSION "3.0.1"
+#define MODIFICATION_DATE "09-08-2016"
#define OK 0
#define ERROR -1
diff --git a/nrpe.spec.in b/nrpe.spec.in
index c9c7c2d..2f0d156 100644
--- a/nrpe.spec.in
+++ b/nrpe.spec.in
@@ -8,7 +8,7 @@
%define _make gmake
%endif
%if %{islinux}
- %define _init_dir /etc/init.d
+ %define _init_dir @initdir@
%define _exec_prefix %{_prefix}/sbin
%define _bindir %{_prefix}/sbin
%define _sbindir %{_prefix}/lib/nagios/cgi
@@ -26,6 +26,7 @@
%define nsusr @nrpe_user@
%define nsgrp @nrpe_group@
%define nsport @nrpe_port@
+%define ns_src_tmpfile "@src_tmpfile@"
# Reserve option to override port setting with:
# rpm -ba|--rebuild --define 'nsport 5666'
@@ -44,7 +45,7 @@ Group: Application/System
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-buildroot
Prefix: %{_prefix}
-Prefix: /etc/init.d
+Prefix: @initdir@
Prefix: /etc/nagios
%if %{isaix}
Requires: nagios-plugins
@@ -80,38 +81,6 @@ Nagios-related applications.
%prep
%setup -q
-
-%pre
-# Create `nagios' group on the system if necessary
-%if %{isaix}
-lsgroup %{nsgrp} > /dev/null 2> /dev/null
-if [ $? -eq 2 ] ; then
- mkgroup %{nsgrp} || %nnmmsg Unexpected error adding group "%{nsgrp}". Aborting install process.
-fi
-%endif
-%if %{islinux}
-getent group %{nsgrp} > /dev/null 2> /dev/null
-if [ $? -ne 0 ] ; then
- groupadd %{nsgrp} || %nnmmsg Unexpected error adding group "%{nsgrp}". Aborting install process.
-fi
-%endif
-
-# Create `nrpe' user on the system if necessary
-%if %{isaix}
-lsuser %{nsusr} > /dev/null 2> /dev/null
-if [ $? -eq 2 ] ; then
- useradd -d %{nshome} -c "%{nsusr}" -g %{nsgrp} %{nsusr} || \
- %nnmmsg Unexpected error adding user "%{nsusr}". Aborting install process.
-fi
-%endif
-%if %{islinux}
-getent passwd %{nsusr} > /dev/null 2> /dev/null
-if [ $? -ne 0 ] ; then
- useradd -r -d %{nshome} -c "%{nsusr}" -g %{nsgrp} %{nsusr} || \
- %nnmmsg Unexpected error adding user "%{nsusr}". Aborting install process.
-fi
-%endif
-
%if %{isaix}
# Check to see if the nrpe service is running and, if so, stop it.
/usr/bin/lssrc -s nrpe > /dev/null 2> /dev/null
@@ -123,20 +92,6 @@ if [ $? -eq 0 ] ; then
fi
%endif
-%if %{islinux}
-# if LSB standard /etc/init.d does not exist,
-# create it as a symlink to the first match we find
-if [ -d /etc/init.d -o -L /etc/init.d ]; then
- : # we're done
-elif [ -d /etc/rc.d/init.d ]; then
- ln -s /etc/rc.d/init.d /etc/init.d
-elif [ -d /usr/local/etc/rc.d ]; then
- ln -s /usr/local/etc/rc.d /etc/init.d
-elif [ -d /sbin/init.d ]; then
- ln -s /sbin/init.d /etc/init.d
-fi
-%endif
-
%if %{isaix}
%post
/usr/bin/lssrc -s nrpe > /dev/null 2> /dev/null
@@ -192,18 +147,8 @@ MAKE=%{_make} ./configure \
%if %{islinux}
install -d -m 0755 ${RPM_BUILD_ROOT}%{_init_dir}
%endif
-DESTDIR=${RPM_BUILD_ROOT} %{_make} install install-daemon-config
-#install -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}
-#install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
-#install -d -m 0755 ${RPM_BUILD_ROOT}%{_libexecdir}
-
-# install templated configuration files
-#cp sample-config/nrpe.cfg ${RPM_BUILD_ROOT}%{_sysconfdir}/nrpe.cfg
-#%if %{isaix}
-#cp init-script ${RPM_BUILD_ROOT}%{_init_dir}/nrpe
-#%endif
-#cp src/nrpe ${RPM_BUILD_ROOT}%{_bindir}
-#cp src/check_nrpe ${RPM_BUILD_ROOT}%{_libexecdir}
+DESTDIR=${RPM_BUILD_ROOT} %{_make} install-groups-users install install-config install-init
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -212,26 +157,36 @@ rm -rf $RPM_BUILD_ROOT
%files
%if %{islinux}
%defattr(755,root,root)
-/etc/init.d/nrpe
+ at initdir@/@initname@
%endif
%{_bindir}/nrpe
%dir %{_sysconfdir}
%defattr(600,%{nsusr},%{nsgrp})
%config(noreplace) %{_sysconfdir}/*.cfg
%defattr(755,%{nsusr},%{nsgrp})
-%doc Changelog LEGAL README
+%if %{ns_src_tmpfile} != ""
+ at tmpfilesd@
+%endif
+%{_bindir}/nrpe-uninstall
+%doc Changelog LEGAL README.md README.SSL.md SECURITY.md
%files plugin
%defattr(755,%{nsusr},%{nsgrp})
%{_libexecdir}
%defattr(644,%{nsusr},%{nsgrp})
-%doc Changelog LEGAL README
+%doc Changelog LEGAL README.md
%changelog
+* Thu Aug 18 2016 John Frickson jfrickson<@>nagios.com
+- Changed 'make install-daemon-config' to 'make install-config'
+- Added make targets 'install-groups-users' and 'install-init'
+- Misc. changes
+
* Mon Mar 12 2012 Eric Stanley estanley<@>nagios.com
- Created autoconf input file
- Updated to support building on AIX
- Updated install to use make install*
+
* Mon Jan 23 2006 Andreas Kasenides ank<@>cs.ucy.ac.cy
- fixed nrpe.cfg relocation to sample-config
- replaced Copyright label with License
diff --git a/sample-config/nrpe.cfg.in b/sample-config/nrpe.cfg.in
index b978237..0e1cff5 100644
--- a/sample-config/nrpe.cfg.in
+++ b/sample-config/nrpe.cfg.in
@@ -18,6 +18,15 @@ log_facility=@log_facility@
+# DEBUGGING OPTION
+# This option determines whether or not debugging messages are logged to the
+# syslog facility.
+# Values: 0=debugging off, 1=debugging on
+
+debug=0
+
+
+
# PID FILE
# The name of the file in which the NRPE daemon should write it's process ID
# number. The file is only written if the NRPE daemon is started by the root
@@ -145,15 +154,6 @@ allow_bash_command_substitution=0
-# DEBUGGING OPTION
-# This option determines whether or not debugging messages are logged to the
-# syslog facility.
-# Values: 0=debugging off, 1=debugging on
-
-debug=0
-
-
-
# COMMAND TIMEOUT
# This specifies the maximum number of seconds that the NRPE daemon will
# allow plugins to finish executing before killing them off.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8b42dc1..9a1c0d4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -10,6 +10,9 @@ srcdir=@srcdir@
SRC_INCLUDE=@srcdir@/../include
CFG_INCLUDE=../include
+# Mainly used for rpmbuild
+# DESTDIR=
+
CC=@CC@
CFLAGS=@CFLAGS@ @DEFS@ -I $(CFG_INCLUDE) -I $(SRC_INCLUDE)
LDFLAGS=@LDFLAGS@ @LIBS@
@@ -19,37 +22,21 @@ OTHERLIBS=@OTHERLIBS@
CP=@CP@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-CFGDIR=@pkgsysconfdir@
-BINDIR=@bindir@
-SBINDIR=@sbindir@
-LIBEXECDIR=@libexecdir@
+prefix=$(DESTDIR)@prefix@
+exec_prefix=$(DESTDIR)@exec_prefix@
+CFGDIR=$(DESTDIR)@pkgsysconfdir@
+BINDIR=$(DESTDIR)@bindir@
+SBINDIR=$(DESTDIR)@sbindir@
+LIBEXECDIR=$(DESTDIR)@libexecdir@
INSTALL=@INSTALL@
NAGIOS_INSTALL_OPTS=@NAGIOS_INSTALL_OPTS@
NRPE_INSTALL_OPTS=@NRPE_INSTALL_OPTS@
-PLUGINSDIR=@pluginsdir@
-PIDDIR=@piddir@
-TMPFILESDIR=@tmpfilesd@
+PLUGINSDIR=$(DESTDIR)@pluginsdir@
+PIDDIR=$(DESTDIR)@piddir@
+TMPFILESDIR=$(DESTDIR)@tmpfilesd@
SRC_TMPFILE=@src_tmpfile@
-#AC_SUBST(pkgsysconfdir)
-#AC_SUBST(objsysconfdir)
-#AC_SUBST(sbindir)
-#AC_SUBST(brokersdir)
-#AC_SUBST(cgibindir)
-#AC_SUBST(webdir)
-#AC_SUBST(privatesysconfdir)
-#AC_SUBST(pkglocalstatedir)
-#AC_SUBST(logdir)
-#AC_SUBST(pipedir)
-#AC_SUBST(spooldir)
-#AC_SUBST(tmpfilesd)
-#AC_SUBST(subsyslockdir)
-#AC_SUBST(subsyslockfile)
-
-
# Generated automatically from configure script
SNPRINTF_O=@SNPRINTF_O@
@@ -79,6 +66,8 @@ install-daemon: install-uninstall
$(INSTALL) -m 755 $(NRPE_INSTALL_OPTS) -d $(PIDDIR); \
fi
@if test "$(TMPFILESDIR)" != "N/A" -a x$(SRC_TMPFILE) != x ; then \
+ echo $(INSTALL) -m 755 -d `dirname $(TMPFILESDIR)`; \
+ $(INSTALL) -m 755 -d `dirname $(TMPFILESDIR)`; \
echo $(INSTALL) -m 644 ../startup/$(SRC_TMPFILE) $(TMPFILESDIR); \
$(INSTALL) -m 644 ../startup/$(SRC_TMPFILE) $(TMPFILESDIR); \
fi
diff --git a/src/acl.c b/src/acl.c
index c8861ca..fdb59d1 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -28,6 +28,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "../include/config.h"
+
#include <sys/types.h>
#include <sys/socket.h>
@@ -256,8 +258,7 @@ int add_ipv4_to_acl(char *ipv4) {
int add_ipv6_to_acl(char *ipv6) {
char *ipv6tmp;
- char *addrtok;
- char *addrsave;
+ char *addr_part, *mask_part;
struct in6_addr addr;
struct in6_addr mask;
int maskval;
@@ -275,31 +276,25 @@ int add_ipv6_to_acl(char *ipv6) {
return 0;
}
+ addr_part = ipv6tmp;
+ mask_part = strchr(ipv6tmp, '/');
+ if (mask_part) {
+ *mask_part = '\0';
+ ++mask_part;
+ }
+
/* Parse the address itself */
-#ifdef HAVE_STRTOK_R
- addrtok = strtok_r(ipv6tmp, "/", &addrsave);
-#else
- addrtok = strtok(ipv6tmp, "/");
-#endif
- if(inet_pton(AF_INET6, addrtok, &addr) <= 0) {
- /* syslog(LOG_ERR, "Invalid IPv6 address in ACL: %s\n", ipv6); */
+ if(inet_pton(AF_INET6, addr_part, &addr) <= 0) {
free(ipv6tmp);
return 0;
}
/* Check whether there is a netmask */
-#ifdef HAVE_STRTOK_R
- addrtok = strtok_r(NULL, "/", &addrsave);
-#else
- addrtok = strtok(NULL, "/");
-#endif
- if(NULL != addrtok) {
+ if (mask_part && *mask_part) {
/* If so, build a netmask */
-
/* Get the number of bits in the mask */
- maskval = atoi(addrtok);
+ maskval = atoi(mask_part);
if(maskval < 0 || maskval > 128) {
- syslog(LOG_ERR, "Invalid IPv6 netmask in ACL: %s\n", ipv6);
free(ipv6tmp);
return 0;
}
diff --git a/src/check_nrpe.c b/src/check_nrpe.c
index 243d678..f5d32d2 100644
--- a/src/check_nrpe.c
+++ b/src/check_nrpe.c
@@ -4,7 +4,7 @@
* Copyright (c) 1999-2008 Ethan Galstad (nagios at nagios.org)
* License: GPL
*
- * Last Modified: 07-12-2016
+ * Last Modified: 09-08-2016
*
* Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
*
diff --git a/src/nrpe.c b/src/nrpe.c
index 19ffd3e..dc93d97 100644
--- a/src/nrpe.c
+++ b/src/nrpe.c
@@ -1546,7 +1546,7 @@ void handle_connection(int sock)
/* log info to syslog facility */
if (debug == TRUE)
syslog(LOG_DEBUG, "Host %s is asking for command '%s' to be run...",
- remote_host, receive_packet.buffer);
+ remote_host, command_name);
/* if this is the version check command, just spew it out */
if (!strcmp(command_name, NRPE_HELLO_COMMAND)) {
diff --git a/startup/default-init.in b/startup/default-init.in
index ebb8288..b0f02a2 100644
--- a/startup/default-init.in
+++ b/startup/default-init.in
@@ -29,6 +29,7 @@ PID_FILE=@piddir@/nrpe.pid
test -x $NRPE_BIN || exit 5
RETVAL=0
+_set_rc (){ return; }
# Default these commands/functions to RedHat/CentOS etc. values
MSG_CMD="echo -n"
diff --git a/startup/default-xinetd.in b/startup/default-xinetd.in
index be08471..eb8248c 100644
--- a/startup/default-xinetd.in
+++ b/startup/default-xinetd.in
@@ -4,7 +4,7 @@ service nrpe
{
disable = yes
socket_type = stream
- port = @npre_port@
+ port = @nrpe_port@
wait = no
user = @nrpe_user@
group = @nrpe_group@
diff --git a/startup/tmpfile.conf.in b/startup/tmpfile.conf.in
index 1416428..9db7ca6 100644
--- a/startup/tmpfile.conf.in
+++ b/startup/tmpfile.conf.in
@@ -1,2 +1,2 @@
#Type Path Mode UID GID Age Argument
-D @piddir@ 0755 @nrpe_user@ @nrpe_group@ - -
+d @piddir@ 0755 @nrpe_user@ @nrpe_group@ - -
diff --git a/update-version b/update-version
index 1720d11..aa93696 100755
--- a/update-version
+++ b/update-version
@@ -28,10 +28,10 @@ else
fi
# Current version number
-CURRENTVERSION=nrpe-3.0
+CURRENTVERSION=3.0.1
# Last date
-LASTDATE=07-12-2016
+LASTDATE=09-08-2016
if [ "x$1" = "x" ]
then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nrpe.git
More information about the Pkg-nagios-changes
mailing list