[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Wed Jun 27 07:08:42 UTC 2007


#### ChangeSet ####
2007-06-21 09:10:39-04:00, neal at pogo.udel.edu 
  ChangeLog, ntp_config.c:
    [Bug 862] includefile nesting; preserve phonelist on reconfig.
  ntp_scanner.h:
    [Bug 862] includefile nesting.

==== ChangeLog ====
2007-06-21 09:09:29-04:00, neal at pogo.udel.edu +1 -0
  [Bug 862] includefile nesting; preserve phonelist on reconfig.

--- 1.73/ChangeLog	2007-06-19 19:07:33 -04:00
+++ 1.74/ChangeLog	2007-06-21 09:09:29 -04:00
@@ -1,3 +1,4 @@
+* [Bug 862] includefile nesting; preserve phonelist on reconfig.
 * Allow null driftfile.
 * More leap second fixes from Dave Mills.
 * Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.

==== ntpd/ntp_config.c ====
2007-06-21 09:05:15-04:00, neal at pogo.udel.edu +3 -2
  [Bug 862] includefile nesting; preserve phonelist on reconfig.

--- 1.156/ntpd/ntp_config.c	2007-06-12 17:59:35 -04:00
+++ 1.157/ntpd/ntp_config.c	2007-06-21 09:05:15 -04:00
@@ -129,7 +129,7 @@ static char res_file[MAX_PATH];
  */
 
 int curr_include_level;			/* The current include level */
-struct FILE_INFO *fp[MAXINCLUDELEVEL];
+struct FILE_INFO *fp[MAXINCLUDELEVEL+1];
 FILE *res_fp;
 struct config_tree my_config;		/* Root of the configuration tree */
 short default_ai_family = AF_UNSPEC;	/* Default either IPv4 or IPv6 */
@@ -1325,7 +1325,8 @@ config_phone(void)
 		}
 		free_node(s);
 	}
-	sys_phone[i] = NULL;
+	if (i)
+		sys_phone[i] = NULL;
 }
 
 static void

==== ntpd/ntp_scanner.h ====
2007-06-21 09:07:42-04:00, neal at pogo.udel.edu +1 -1
  [Bug 862] includefile nesting.

--- 1.2/ntpd/ntp_scanner.h	2007-04-23 12:33:46 -04:00
+++ 1.3/ntpd/ntp_scanner.h	2007-06-21 09:07:42 -04:00
@@ -54,7 +54,7 @@ extern struct FILE_INFO *ip_file;   /* P
 extern short default_ai_family;
 extern int old_config_style;
 extern int input_from_file;
-extern struct FILE_INFO *fp[MAXINCLUDELEVEL];
+extern struct FILE_INFO *fp[];
 
 /* VARIOUS SUBROUTINE DECLARATIONS
  * -------------------------------


More information about the bk-ntp-dev-send mailing list