Spec file updates, bug fixes

Changelog

@@ -3,9 +3,11 @@ NRPE Changelog
 **************
 
 
-2.3 - ??/??/2006
----------------
-- Spec file fix
+2.3 - 01/23/2006
+----------------
+- Spec file fixes
+- Removed errant PID file debugging code
+- Fixed problem with trimming command definitions
 
 
 2.2 - 01/22/2006

configure

@@ -1294,9 +1294,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 PKG_NAME=nrpe
-PKG_VERSION="2.2"
+PKG_VERSION="2.3"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="01-21-2006"
+PKG_REL_DATE="01-23-2006"
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

configure.in

@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 PKG_NAME=nrpe
-PKG_VERSION="2.2"
+PKG_VERSION="2.3"
 PKG_HOME_URL="http://www.nagios.org/"
-PKG_REL_DATE="01-21-2006"
+PKG_REL_DATE="01-23-2006"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL

include/common.h

@@ -23,8 +23,8 @@
 
 #include "config.h"
 
-#define PROGRAM_VERSION "2.2"
-#define MODIFICATION_DATE "01-21-2006"
+#define PROGRAM_VERSION "2.3"
+#define MODIFICATION_DATE "01-23-2006"
 
 #define OK		0
 #define ERROR		-1

nrpe.spec

@@ -1,5 +1,5 @@
 %define name nrpe
-%define version 2.2
+%define version 2.3
 %define release 1
 %define nsusr nagios
 %define nsgrp nagios
@@ -17,7 +17,7 @@ URL: http://www.nagios.org
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Copyright: GPL
+License: GPL
 Group: Application/System
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -109,7 +109,8 @@ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
 	--libexecdir=%{_prefix}/lib/nagios/plugins \
 	--datadir=%{_prefix}/share/nagios \
 	--sysconfdir=/etc/nagios \
-	--localstatedir=/var/log/nagios 
+	--localstatedir=/var/log/nagios \
+	--enable-command-args
 
 make all
 
@@ -147,6 +148,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changelog LEGAL README
 
 %changelog
+* Mon Jan 23 2006 Andreas Kasenides ank<@>cs.ucy.ac.cy
+- fixed nrpe.cfg relocation to sample-config
+- replaced Copyright label with License
+- added --enable-command-args to enable remote arg passing (if desired can be disabled by commenting out)
+
 * Wed Nov 12 2003 Ingimar Robertsson <iar@skyrr.is>
 - Added adding of nagios group if it does not exist.
 

src/check_nrpe.c

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

src/nrpe.c

@@ -4,7 +4,7 @@
  * Copyright (c) 1999-2006 Ethan Galstad (nagios@nagios.org)
  * License: GPL
  *
- * Last Modified: 01-21-2006
+ * Last Modified: 01-23-2006
  *
  * Command line: nrpe -c <config_file> [--inetd | --daemon]
  *
@@ -310,6 +310,8 @@ int read_config_file(char *filename){
 		for(x=len-1;x>=0;x--){
 			if(isspace(input_line[x]))
 				input_line[x]='\x0';
+			else
+				break;
 		        }
 
 		/* skip comments and blank lines */
@@ -1335,7 +1337,6 @@ int write_pid_file(void){
 	        }
 	else{
 		syslog(LOG_ERR,"Cannot write to pidfile '%s'.",pid_file);
-		perror("TEST");
 	        }
 
 	return OK;