ChangeLog, ntp_config.c:

  [Bug 862] includefile nesting; preserve phonelist on reconfig.
ntp_scanner.h:
  [Bug 862] includefile nesting.

bk: 467a78cfBaUZRMVAw2a8wC6mLDCUqg

diff --git a/ChangeLog b/ChangeLog
index 7fb7b54042cc81145af62bedfef7f91e6fc2a90f..e3aa3009e866f70d248017683edb966f33eb42ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 991d5bf451ec448aca5100418b29cad981401760..84fdd44fc34250e5ad286ed89f2df2f087043d51 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -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

diff --git a/ntpd/ntp_scanner.h b/ntpd/ntp_scanner.h
index d743d746946667b9dad15bd93a4a6b2351d90007..527aa6c69ae3c4230bd7d9354e4a5422e4a3945a 100644 (file)
--- a/ntpd/ntp_scanner.h
+++ b/ntpd/ntp_scanner.h
@@ -54,7 +54,7 @@ extern struct FILE_INFO *ip_file;   /* Pointer to the configuration file stream
 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
  * -------------------------------