Bug fix with configure script group option, prep for new release

Changelog

@@ -3,11 +3,19 @@ NRPE Changelog
 **************
 
 
+
+2.8.1 - 05/10/2007
+-----------------
+- Fixed configure script error with user-specified NRPE group
+
+
+
 2.8 - 05/08/2007
 ---------------
 - Added support for multiline plugin output (limited to 1KB at the moment) (Matthias Flacke)
 
 
+
 2.8b1 - 03/14/2007
 -----------------
 - Changes to sample config files
@@ -15,17 +23,20 @@ NRPE Changelog
 - Updated documentation and added easier installation commands
 
 
+
 2.7.1 - 03/08/2007
 ------------------
 - Changed C++ style comment to C style to fix compilation errors on AIX (Ryan McGarry)
 
 
+
 2.7 - 02/18/2007
 ----------------
 - Patches for detection SSL header and library locations (Andrew Boyce-Lewis)
 - NRPE daemon will now partially ignore non-fatal configuration file errors and attempt to startup (Andrew Boyce-Lewis)
 
 
+
 2.6 - 12/11/2006
 ----------------
 - Added -u option to check_nrpe to return UNKNOWN states on socket timeouts (Bjoern Beutel)
@@ -33,6 +44,7 @@ NRPE Changelog
 - Added graceful timeout to check_nrpe to ensure connection to NRPE daemon is properly closed (Mark Plaksin)
 
 
+
 2.5.2 - 06/30/2006
 ------------------
 - Fixed incorrect service name in sample xinetd config file
@@ -41,11 +53,13 @@ NRPE Changelog
 - Fix to (re)allow week random seed (Gerhard Lausser)
 
 
+
 2.5.1 - 04/09/2006
 ------------------
 - Patch to fix segfault if --no-ssl option is used (Sean Finney/Peter Palfrader)
 
 
+
 2.5 - 04/06/2006
 ----------------
 - (Re)added allowed_hosts option for systems that don't support TCP wrappers
@@ -53,6 +67,7 @@ NRPE Changelog
 - Fix for config file directory inclusion on ReiserFS (Gerhard Lausser)
 
 
+
 2.4 - 02/22/2006
 ----------------
 - Added option to allow week random seed (Gerhard Lausser)
@@ -62,6 +77,7 @@ NRPE Changelog
 - Fixed bug with disconnect message in debug mode
 
 
+
 2.3 - 01/23/2006
 ----------------
 - Spec file fixes
@@ -69,6 +85,7 @@ NRPE Changelog
 - Fixed problem with trimming command definitions
 
 
+
 2.2 - 01/22/2006
 ----------------
 - Spec file fix
@@ -80,6 +97,7 @@ NRPE Changelog
 - Added config file option for writing a PID file
 
 
+
 2.1 - 01/19/2004
 ----------------
 - Replaced host access list with TCP wrapper support
@@ -92,6 +110,7 @@ NRPE Changelog
   plugin process is closed
 
 
+
 2.0 - 09/08/2003
 ----------------
 - Added support for passing arguments to command
@@ -106,6 +125,7 @@ NRPE Changelog
 - Added license exemption for use with OpenSSL
 
 
+
 1.8 - 01/16/2003
 ----------------
 - Daemon now closes stdio/out/err properly (James Peterson)
@@ -114,6 +134,7 @@ NRPE Changelog
 - Fixed incorrect command line options in check_nrpe plugin
 
 
+
 1.7 - 01/08/2003
 ----------------
 - Spec file updates and minor bug fixes (James Peterson)
@@ -122,6 +143,7 @@ NRPE Changelog
 - Bug fix for command_timeout variable (James Peterson)
 
 
+
 1.6 - 12/30/2002
 ----------------
 - Updated sample commands to match new plugin argument format
@@ -134,23 +156,27 @@ NRPE Changelog
 - Added --with-nrpe-port config directive (James Peterson)
 
 
+
 1.5 - 06/03/2002
 ----------------
 - Added setuid/setgid option to config file (suggested by Marek Cervenka) 
 
 
+
 1.4 - 06/01/2002
 ----------------
 - Changed STATE_UNKNOWN to value of 3 instead of -1 (old style)
 - Minor doc and sample config file changes
 
 
+
 1.3 - 02/21/2002
 ----------------
 - Name and version change
 - Ignore SIGHUP, minor cleanup (Jon Andrews)
 
 
+
 1.2.5 - 12/22/2001
 ------------------
 - Implemented Beej's sendall() to handle partial send()s
@@ -158,45 +184,53 @@ NRPE Changelog
 - Removed some old crud
 
 
+
 1.2.4 - 02/22/2001
 ------------------
 - I forgot what changes I made.  Go figure...
 
 
+
 1.2.3 - 12/21/2000
 ------------------
 - A bit more documentation on configuring command definitions for the plugin
 
 
+
 1.2.2 - 06/05/2000
 ------------------
 - Fixed error in docs for running under inetd using TCP wrappers
 - Replaced old email address in src/netutils.h with new one
 
 
+
 1.2.1 - 05/07/2000
 ------------------
 - Removed trapping of SIGCHLD
 - Changed wait4() to waitpid() to allow compilation on HP-UX and AIX
 
 
+
 1.2.0 - 04/18/2000
 ------------------
 - Server forks twice after accepting a client connection, so as to prevent the
   creation of zombies
 
 
+
 1.1.5 - 04/07/2000
 ------------------
 - Fixed a small bug where one debug message was not getting logged properly
 
 
+
 1.1.4 - 03/30/2000
 ------------------
 - Added option to disable/enable debug messages using the debug option in the
   config file
 
 
+
 1.1.3 - 03/11/2000
 ------------------
 - Changed config file to use an absolute path
@@ -206,12 +240,14 @@ NRPE Changelog
   e.g. running check_nrpe on Linux and nrpe on Solaris. (Rene Klootwijk)
 
 
+
 1.1.2 - 03/07/2000
 ------------------
 - Removed unnecessary code in signal handler routine
 - Unused signals are no longer trapper
 
 
+
 1.1.1 - 02/28/2000 - RKL
 ---------------------------
 - Modified syslog code to include string describing the error code.
@@ -232,11 +268,13 @@ NRPE Changelog
   of this interface in the nrpe.cfg file (e.g. server_address=192.168.2.3)
 
 
+
 1.0   - 02/16/2000
 ------------------
 - Added ability to run as a service under inetd
 
 
+
 1.0b6 - 02/01/2000
 ------------------
 - Added configure script
@@ -246,12 +284,14 @@ NRPE Changelog
 - Cleaned up code
 
 
+
 1.0b5 - 01/10/2000
 ------------------
 - Added init script contributed by Jacob L
 - Incorporated syslog code and other patches contributed by Jacob L
 
 
+
 1.0b4 - 11/04/1999
 ------------------
 - Changed 'allowed_ip' option in configuration file to

configure

@@ -857,7 +857,7 @@ Optional Packages:
 --with-nrpe-user=<user> sets user name to run NRPE
 --with-nrpe-group=<group> sets group name to run NRPE
 --with-nrpe-port=<port> sets port number for NRPE to listen on
---with-nagios-user=<user> sets user name forfile permissions
+--with-nagios-user=<user> sets user name for file permissions
 --with-nagios-group=<grp> sets group name file permissions
 
 Some influential environment variables:
@@ -1296,9 +1296,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 PKG_NAME=nrpe
-PKG_VERSION="2.8"
+PKG_VERSION="2.8.1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="05-08-2007"
+PKG_REL_DATE="05-10-2007"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -6119,7 +6119,7 @@ fi;
 # Check whether --with-nrpe_group or --without-nrpe_group was given.
 if test "${with_nrpe_group+set}" = set; then
   withval="$with_nrpe_group"
-  nrpe_grp=$withval
+  nrpe_group=$withval
 else
   nrpe_group=nagios
 fi;
@@ -6133,6 +6133,7 @@ else
 fi;
 
 
+echo "GROUP: $nrpe_group"
 NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group"
 
 
@@ -6162,7 +6163,6 @@ fi;
 NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group"
 
 
-A
 
 # Check whether --enable-command-args or --disable-command-args was given.
 if test "${enable_command_args+set}" = set; then
@@ -7318,12 +7318,16 @@ echo ""
 echo " General Options:"
 echo " -------------------------"
 
-echo "$as_me:$LINENO: result:  NRPE port:  $nrpe_port" >&5
-echo "${ECHO_T} NRPE port:  $nrpe_port" >&6
-echo "$as_me:$LINENO: result:  NRPE user:  $nrpe_user" >&5
-echo "${ECHO_T} NRPE user:  $nrpe_user" >&6
-echo "$as_me:$LINENO: result:  NRPE group: $nrpe_group" >&5
-echo "${ECHO_T} NRPE group: $nrpe_group" >&6
+echo "$as_me:$LINENO: result:  NRPE port:    $nrpe_port" >&5
+echo "${ECHO_T} NRPE port:    $nrpe_port" >&6
+echo "$as_me:$LINENO: result:  NRPE user:    $nrpe_user" >&5
+echo "${ECHO_T} NRPE user:    $nrpe_user" >&6
+echo "$as_me:$LINENO: result:  NRPE group:   $nrpe_group" >&5
+echo "${ECHO_T} NRPE group:   $nrpe_group" >&6
+echo "$as_me:$LINENO: result:  Nagios user:  $nagios_user" >&5
+echo "${ECHO_T} Nagios user:  $nagios_user" >&6
+echo "$as_me:$LINENO: result:  Nagios group: $nagios_group" >&5
+echo "${ECHO_T} Nagios group: $nagios_group" >&6
 
 
 echo ""

configure.in

@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 PKG_NAME=nrpe
-PKG_VERSION="2.8"
+PKG_VERSION="2.8.1"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="05-08-2007"
+PKG_REL_DATE="05-10-2007"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
@@ -259,23 +259,23 @@ if test x$check_for_ssl = xyes; then
 fi
 
 AC_ARG_WITH(nrpe_user,--with-nrpe-user=<user> sets user name to run NRPE,nrpe_user=$withval,nrpe_user=nagios)
-AC_ARG_WITH(nrpe_group,--with-nrpe-group=<group> sets group name to run NRPE,nrpe_grp=$withval,nrpe_group=nagios)
+AC_ARG_WITH(nrpe_group,--with-nrpe-group=<group> sets group name to run NRPE,nrpe_group=$withval,nrpe_group=nagios)
 AC_ARG_WITH(nrpe_port,--with-nrpe-port=<port> sets port number for NRPE to listen on,nrpe_port=$withval,nrpe_port=5666)
 AC_SUBST(nrpe_user)
 AC_SUBST(nrpe_group)
+echo "GROUP: $nrpe_group"
 NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group"
 AC_SUBST(NRPE_INSTALL_OPTS)
 AC_SUBST(nrpe_port)
 AC_DEFINE_UNQUOTED(DEFAULT_SERVER_PORT,$nrpe_port)
 
-AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name forfile permissions,nagios_user=$withval,nagios_user=nagios)
+AC_ARG_WITH(nagios_user,--with-nagios-user=<user> sets user name for file permissions,nagios_user=$withval,nagios_user=nagios)
 AC_ARG_WITH(nagios_group,--with-nagios-group=<grp> sets group name file permissions,nagios_grp=$withval,nagios_group=nagios)
 AC_SUBST(nagios_user)
 AC_SUBST(nagios_group)
 NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group"
 AC_SUBST(NAGIOS_INSTALL_OPTS)
 
-A
 
 AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!,AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS))
 
@@ -299,9 +299,11 @@ echo ""
 echo " General Options:"
 echo " -------------------------"
 
-AC_MSG_RESULT([ NRPE port:  $nrpe_port])
-AC_MSG_RESULT([ NRPE user:  $nrpe_user])
-AC_MSG_RESULT([ NRPE group: $nrpe_group])
+AC_MSG_RESULT([ NRPE port:    $nrpe_port])
+AC_MSG_RESULT([ NRPE user:    $nrpe_user])
+AC_MSG_RESULT([ NRPE group:   $nrpe_group])
+AC_MSG_RESULT([ Nagios user:  $nagios_user])
+AC_MSG_RESULT([ Nagios group: $nagios_group])
 
 
 echo ""

include/common.h

@@ -2,7 +2,7 @@
  *
  * COMMON.H - NRPE Common Include File
  * Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
- * Last Modified: 05-08-2007
+ * Last Modified: 05-10-2007
  *
  * License:
  *
@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#define PROGRAM_VERSION "2.8"
-#define MODIFICATION_DATE "05-08-2007"
+#define PROGRAM_VERSION "2.8.1"
+#define MODIFICATION_DATE "05-10-2007"
 
 #define OK		0
 #define ERROR		-1

include/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0xE3,0x60,0x78,0x76,0x5A,0x20,0x1C,0xA0,0x67,0xDA,0x93,0x59,
-		0x38,0x9D,0x0F,0x79,0x39,0x34,0x94,0xF7,0xBC,0xD2,0x40,0xA1,
-		0xE9,0x2C,0x72,0x9D,0x8E,0xD2,0xA8,0xCE,0xC9,0x01,0xD8,0x7E,
-		0x18,0xD4,0x55,0xFF,0x91,0xAF,0x9D,0x13,0x0C,0xBB,0x0F,0xBF,
-		0x8C,0x28,0x6B,0x06,0xF4,0xED,0x42,0x0A,0x62,0xF1,0x45,0x65,
-		0xD6,0x98,0x40,0x63,
+		0x93,0x6C,0x38,0x09,0x07,0x6C,0xA2,0xAF,0xBC,0x71,0xD8,0xC3,
+		0xA3,0x5E,0xEE,0x36,0xDD,0x5A,0x37,0x4B,0xA8,0x5C,0x45,0x4C,
+		0x7D,0xCD,0xA2,0x8D,0xD2,0xBC,0x24,0x86,0xB4,0xCE,0x21,0xDD,
+		0xE6,0xBD,0x27,0x27,0x7A,0x23,0x03,0xBC,0x7C,0x38,0x9A,0x31,
+		0xED,0xFA,0xA2,0xFC,0x42,0xE0,0x36,0x9E,0x55,0x4E,0x7C,0x8E,
+		0x7A,0xAF,0xE2,0x4B,
 		};
 	static unsigned char dh512_g[]={
 		0x02,

nrpe.spec

@@ -1,5 +1,5 @@
 %define name nrpe
-%define version 2.8
+%define version 2.8.1
 %define release 1
 %define nsusr nagios
 %define nsgrp nagios

src/Makefile.in

@@ -1,7 +1,7 @@
 ###############################
 # Makefile for NRPE
 #
-# Last Modified: 03-14-2007
+# Last Modified: 05-10-2007
 ###############################
 
 
@@ -46,7 +46,7 @@ install-plugin:
 
 install-daemon:
 	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) nrpe $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 775 $(NRPE_INSTALL_OPTS) nrpe $(DESTDIR)$(BINDIR)
 
 clean:
 	rm -f core nrpe check_nrpe

src/check_nrpe.c

@@ -4,7 +4,7 @@
  * Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
  * License: GPL
  *
- * Last Modified: 05-08-2007
+ * Last Modified: 05-10-2007
  *
  * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
  *

src/nrpe.c

@@ -4,7 +4,7 @@
  * Copyright (c) 1999-2007 Ethan Galstad (nagios@nagios.org)
  * License: GPL
  *
- * Last Modified: 05-08-2007
+ * Last Modified: 05-10-2007
  *
  * Command line: nrpe -c <config_file> [--inetd | --daemon]
  *

update-version

@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=2.8
+CURRENTVERSION=2.8.1
 
 # Last date
-LASTDATE=05-08-2007
+LASTDATE=05-10-2007
 
 if [ "x$1" = "x" ]
 then