Ethan Galstad 22 yıl önce
ebeveyn
işleme
4b9f23fda9
2 değiştirilmiş dosya ile 18 ekleme ve 11 silme
  1. 6 6
      include/dh.h
  2. 12 5
      src/nrpe.c

+ 6 - 6
include/dh.h

@@ -4,12 +4,12 @@
 DH *get_dh512()
 	{
 	static unsigned char dh512_p[]={
-		0xBA,0xB9,0xA1,0x11,0x5A,0xB2,0x92,0xDC,0xF0,0x64,0x37,0x16,
-		0x6D,0x18,0xCD,0x2A,0xEF,0xD4,0x98,0x76,0x04,0x7F,0x59,0x4D,
-		0x71,0xAD,0xE8,0xEF,0x74,0xF0,0x82,0x04,0xDA,0x75,0xC5,0x29,
-		0xE8,0x32,0xE6,0xC4,0xAA,0x09,0xCC,0xD1,0x90,0x23,0xAF,0x74,
-		0x91,0x16,0xFB,0x89,0x0F,0xFF,0xC3,0xCB,0x91,0xE7,0x4F,0xCF,
-		0x5E,0xAE,0x7B,0x7B,
+		0xD8,0xF3,0x97,0xC2,0xF0,0x79,0x32,0xD3,0x54,0x25,0x59,0x02,
+		0x70,0xF9,0x61,0xD6,0x86,0x90,0x83,0x29,0xC5,0x00,0x53,0x4F,
+		0x5D,0x8B,0x10,0x01,0x23,0x7E,0x56,0x2F,0x06,0xA7,0x94,0x2B,
+		0x71,0xEE,0xB6,0xF3,0x13,0x9C,0x1E,0x23,0x7E,0x42,0xE4,0xE4,
+		0x8A,0x9C,0x2E,0x6D,0x59,0x83,0x33,0xBE,0xF9,0xA7,0x46,0xB0,
+		0x5F,0x32,0xCF,0xCB,
 		};
 	static unsigned char dh512_g[]={
 		0x02,

+ 12 - 5
src/nrpe.c

@@ -290,6 +290,7 @@ int read_config_file(char *filename){
 	FILE *fp;
 	char config_file[MAX_FILENAME_LENGTH];
 	char input_buffer[MAX_INPUT_BUFFER];
+	char *input_line;
 	char *temp_buffer;
 	char *varname;
 	char *varvalue;
@@ -309,17 +310,23 @@ int read_config_file(char *filename){
 	while(fgets(input_buffer,MAX_INPUT_BUFFER-1,fp)){
 
 		line++;
+        input_line = input_buffer;
+
+        /* skip leading whitespace */
+        while (isspace(*input_line)) {
+                ++input_line;
+        }
 
 		/* skip comments and blank lines */
-		if(input_buffer[0]=='#')
+		if(input_line[0]=='#')
 			continue;
-		if(input_buffer[0]=='\x0')
+		if(input_line[0]=='\x0')
 			continue;
-		if(input_buffer[0]=='\n')
+		if(input_line[0]=='\n')
 			continue;
 
 		/* get the variable name */
-		varname=strtok(input_buffer,"=");
+		varname=strtok(input_line,"=");
 		if(varname==NULL){
 			syslog(LOG_ERR,"No variable name specified in config file '%s' - Line %d\n",filename,line);
 			return ERROR;
@@ -368,7 +375,7 @@ int read_config_file(char *filename){
                         server_address[sizeof(server_address)-1]='\0';
                         }
 
-		else if(strstr(input_buffer,"command[")){
+		else if(strstr(input_line,"command[")){
 			temp_buffer=strtok(varname,"[");
 			temp_buffer=strtok(NULL,"]");
 			if(temp_buffer==NULL){