Misc fixes

src/check_nrpe.c

@@ -75,7 +75,7 @@ int main(int argc, char **argv){
 		printf("Last Modified: %s\n",MODIFICATION_DATE);
 		printf("License: GPL\n");
 #ifdef HAVE_SSL
-		printf("SSL/TLS Available: Anonymous DHMode, OpenSSL 0.9.6 or higher required\n");
+		printf("SSL/TLS Available: Anonymous DH Mode, OpenSSL 0.9.6 or higher required\n");
 #endif
 		printf("\n");
 	        }
@@ -89,7 +89,9 @@ int main(int argc, char **argv){
 		printf(" [port]     = The port on which the daemon is running (default=%d)\n",DEFAULT_SERVER_PORT);
 		printf(" [timeout]  = Number of seconds before connection times out (default=%d)\n",DEFAULT_SOCKET_TIMEOUT);
 		printf(" [command]  = The name of the command that the remote daemon should run\n");
-		printf(" [arglist]  = Optional arguments that should be passed to the command\n");
+		printf(" [arglist]  = Optional arguments that should be passed to the command.  Multiple\n");
+		printf("              arguments should be separated by a space.  If provided, this must be\n");
+		printf("              the last option supplied on the command line.\n");
 		printf("\n");
 		printf("Note:\n");
 		printf("This plugin requires that you have the NRPE daemon running on the remote host.\n");

src/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0x84,0x7F,0xF8,0x9D,0x49,0xE4,0x11,0xF8,0xDB,0x78,0xB3,0xE2,
-		0xB4,0x78,0x91,0xF6,0x3F,0xE4,0xE8,0xE9,0x21,0xC0,0xA1,0xFE,
-		0x28,0x26,0xBC,0x0B,0xC3,0xEA,0x00,0xE2,0xE3,0x97,0x83,0xA3,
-		0x7C,0x55,0xA2,0x5E,0x66,0x07,0xBF,0x60,0xD1,0x4C,0x5D,0xF4,
-		0x4D,0x1A,0x41,0x42,0xFD,0x14,0xE9,0x93,0x1E,0x94,0xD7,0x4B,
-		0x6E,0x9D,0x43,0x4B,
+		0xAA,0x78,0xD5,0x77,0x52,0x82,0xD3,0x0F,0x0E,0x83,0xFD,0x2A,
+		0x1A,0x33,0x95,0x3E,0x56,0xB7,0x6D,0x19,0x90,0xBC,0x71,0x9F,
+		0x78,0x93,0xAE,0x3B,0xCA,0x1B,0xA1,0x3E,0x91,0xB0,0xB3,0x28,
+		0x0C,0x36,0x3C,0x4D,0xFE,0xDA,0xB2,0xC0,0xA1,0xED,0x90,0xC3,
+		0xD5,0xBE,0x1D,0x4A,0x03,0x80,0x78,0x0D,0x87,0x94,0xCE,0xF5,
+		0x71,0x21,0x14,0x4B,
 		};
 	static unsigned char dh512_g[]={
 		0x02,

src/nrpe.c

@@ -378,12 +378,8 @@ int read_config_file(char *filename){
                 else if(!strcmp(varname,"nrpe_group"))
 			nrpe_group=strdup(varvalue);
 		
-		else if(!strcmp(varname,"dont_blame_nrpe")){
-			if(atoi(varvalue)==1)
-				allow_arguments=TRUE;
-			else
-				allow_arguments=FALSE;
-		        }
+		else if(!strcmp(varname,"dont_blame_nrpe"))
+			allow_arguments=(atoi(varvalue)==1)?TRUE:FALSE;
 
  		else if(!strcmp(varname,"command_timeout")){
 			command_timeout=atoi(varvalue);