New installation commands, updated sample config files

Makefile.in

@@ -72,10 +72,11 @@ install:
 	cd $(SRC_BASE) && $(MAKE) $@
 
 install-xinetd:
-	$(INSTALL) -m 644 sample-config/nrpe-xinetd /etc/xinetd.d/nrpe 
+	$(INSTALL) -m 644 sample-config/nrpe.xinetd /etc/xinetd.d/nrpe 
 
 install-daemon-config:
-	$(INSTALL) -m 644 sample-config/nrpe.xinetd /etc/xinetd.d/nrpe 
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m 644 sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)
 
 clean:
 	cd $(SRC_BASE); $(MAKE) $@ ; cd ..

include/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0xD8,0x2E,0x02,0x67,0x1D,0x05,0xA6,0xCA,0xFA,0x3C,0xC8,0xFD,
-		0xF3,0xAA,0x46,0xCB,0xF0,0x2C,0x8A,0xE8,0x85,0x9A,0xB5,0x02,
-		0x43,0x38,0x71,0x1A,0x08,0x50,0x30,0xE8,0x05,0x53,0x8F,0x35,
-		0xB3,0xF9,0xD7,0x20,0xD4,0x1E,0x13,0xAC,0x8B,0x4F,0x7D,0x66,
-		0x6C,0x77,0xE0,0xFB,0xAF,0xCB,0x16,0x2B,0x6E,0xAF,0xF0,0x73,
-		0x08,0x3E,0x98,0x43,
+		0xC1,0xA4,0xAA,0x34,0x9D,0x93,0x2C,0xA0,0xA9,0x9A,0xE8,0xE3,
+		0x30,0x07,0x2C,0x5A,0x7D,0xFA,0x42,0x7B,0xDF,0xF4,0xA0,0xCE,
+		0xC1,0xB8,0xA1,0xFD,0x97,0xA7,0xA0,0x8C,0x37,0xC7,0xE9,0xD1,
+		0x32,0x77,0xB5,0x9C,0x59,0x43,0x78,0x83,0x2C,0x2D,0x99,0x89,
+		0x54,0x12,0x89,0x6E,0xC1,0x46,0xFF,0x64,0xF7,0x66,0x9E,0x59,
+		0xB2,0x98,0x47,0x7B,
 		};
 	static unsigned char dh512_g[]={
 		0x02,

sample-config/nrpe.xinetd.in

@@ -3,7 +3,8 @@
 service nrpe
 {
        	flags           = REUSE
-        socket_type     = stream        
+        socket_type     = stream    
+	port		= @nrpe_port@    
        	wait            = no
         user            = @nrpe_user@
 	group		= @nrpe_group@

src/Makefile.in

@@ -41,10 +41,12 @@ install:
 	$(MAKE) install-daemon
 
 install-plugin:
+	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) check_nrpe $(DESTDIR)$(LIBEXECDIR)
 
 install-daemon:
-	$(INSTALL) -m 775 $(NRPE_INSTALL_OPTS) nrpe $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 775 $(NAGIOS_INSTALL_OPTS) nrpe $(DESTDIR)$(BINDIR)
 
 clean:
 	rm -f core nrpe check_nrpe