--- nrpe-2.12/contrib/README.nrpe_check_control.p0	2003-10-24 12:00:40 +1100
+++ nrpe-2.12/contrib/README.nrpe_check_control	2008-05-05 02:36:47 +1100
@@ -4,9 +4,9 @@ NOTES:
 The service definition below assumes you have a command called "check_tcp" already setup
 in your config files.
 
-The command definition below assumes that the $USER1$ macro is used to define the location
-of your Nagios plugins (i.e. "/usr/local/nagios/libexec") and that the nrpe_check_control
-service is located in that directory.
+The command definition below assumes that the $USER2$ macro is used to define the location
+of your Nagios event handlerds directory (i.e. "/usr/lib/nagios/eventhandlers") and that
+the nrpe_check_control service is located in that directory.
 
 
 
@@ -18,12 +18,12 @@ define service {
 	description	NRPE
 	...
 	event_handler	nrpe_check_control
-	check_command	check_tcp!-p 5666
-        }
+	check_command	check_tcp!-p 65534
+	}
 
 define command {
 	command_name	nrpe_check_control
-	command_line	$USER1$/nrpe_check_control $SERVICESTATE$ $SERVICESTATETYPE$ $SERVICEATTEMPT$ "$HOSTNAME$"
+	command_line	$USER2$/nrpe_check_control $SERVICESTATE$ $SERVICESTATETYPE$ $SERVICEATTEMPT$ "$HOSTNAME$"
 	}
 
 
--- nrpe-2.12/sample-config/nrpe.cfg.in.p0	2007-11-24 03:31:23 +1000
+++ nrpe-2.12/sample-config/nrpe.cfg.in	2008-05-05 02:39:01 +1100
@@ -41,7 +41,7 @@ server_port=@nrpe_port@
 # and you do not want nrpe to bind on all interfaces.
 # NOTE: This option is ignored if NRPE is running under either inetd or xinetd
 
-#server_address=127.0.0.1
+server_address=127.0.0.1
 
 
 
@@ -92,7 +92,7 @@ allowed_hosts=127.0.0.1
 #
 # Values: 0=do not allow arguments, 1=allow command arguments
 
-dont_blame_nrpe=0
+dont_blame_nrpe=1
 
 
 
@@ -172,6 +172,7 @@ connection_timeout=300
 #include_dir=<somedirectory>
 #include_dir=<someotherdirectory>
 
+#include_dir=/etc/nagios/nrpe-commands
 
 
 # COMMAND DEFINITIONS
@@ -188,7 +189,7 @@ connection_timeout=300
 #
 # Note: Any plugins that are used in the command lines must reside
 # on the machine that this daemon is running on!  The examples below
-# assume that you have plugins installed in a /usr/local/nagios/libexec
+# assume that you have plugins installed in a /usr/lib/nagios/plugins
 # directory.  Also note that you will have to modify the definitions below
 # to match the argument format the plugins expect.  Remember, these are
 # examples only!
@@ -196,11 +197,11 @@ connection_timeout=300
 
 # The following examples use hardcoded command arguments...
 
-command[check_users]=@libexecdir@/check_users -w 5 -c 10
-command[check_load]=@libexecdir@/check_load -w 15,10,5 -c 30,25,20
-command[check_hda1]=@libexecdir@/check_disk -w 20% -c 10% -p /dev/hda1
-command[check_zombie_procs]=@libexecdir@/check_procs -w 5 -c 10 -s Z
-command[check_total_procs]=@libexecdir@/check_procs -w 150 -c 200 
+#command[check_users]=@libexecdir@/nagios/plugins/check_users -w 5 -c 10
+#command[check_load]=@libexecdir@/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
+#command[check_hda1]=@libexecdir@/nagios/plugins/check_disk -w 20 -c 10 -p /dev/hda1
+#command[check_zombie_procs]=@libexecdir@/nagios/plugins/check_procs -w 5 -c 10 -s Z
+#command[check_total_procs]=@libexecdir@/nagios/plugins/check_procs -w 150 -c 200 
 
 
 # The following examples allow user-supplied arguments and can
@@ -209,7 +210,7 @@ command[check_total_procs]=@libexecdir@/
 # config file is set to '1'.  This poses a potential security risk, so
 # make sure you read the SECURITY file before doing this.
 
-#command[check_users]=@libexecdir@/check_users -w $ARG1$ -c $ARG2$
-#command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$
-#command[check_disk]=@libexecdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
-#command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+#command[check_users]=@libexecdir@/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
+#command[check_load]=@libexecdir@/nagios/plugins/check_load -w $ARG1$ -c $ARG2$
+#command[check_disk]=@libexecdir@/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+#command[check_procs]=@libexecdir@/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
--- nrpe-2.12/sample-config/nrpe.xinetd.in.p0	2007-03-10 05:19:17 +1000
+++ nrpe-2.12/sample-config/nrpe.xinetd.in	2008-05-05 02:34:56 +1100
@@ -1,16 +1,16 @@
-# default: on
+# default: off
 # description: NRPE (Nagios Remote Plugin Executor)
 service nrpe
 {
-       	flags           = REUSE
-        socket_type     = stream    
-	port		= @nrpe_port@    
-       	wait            = no
-        user            = @nrpe_user@
-	group		= @nrpe_group@
-       	server          = @bindir@/nrpe
-        server_args     = -c @sysconfdir@/nrpe.cfg --inetd
-       	log_on_failure  += USERID
-        disable         = no
-	only_from       = 127.0.0.1
+	disable			= yes
+	flags			= REUSE
+	type			= UNLISTED
+	port			= @nrpe_port@
+	socket_type		= stream
+	wait			= no
+	user			= @nrpe_user@
+	group			= @nrpe_grp@
+	server			= @sbindir@/nrpe
+	server_args		= -c @sysconfdir@/nagios/nrpe.cfg --inetd
+	only_from		= 127.0.0.1
 }