From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 19 Jun 2007 06:39:24 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P53~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fd9106aedf1e29970898746214e709e4b29de54;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/neal/neal.ntp-dev

bk: 46777a1cf1Q1o49A735Ga8uevQB2_A
---

7fd9106aedf1e29970898746214e709e4b29de54
diff --cc ChangeLog
index 44c095016,77b0bba3c..7453dd2da
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
+ * Allow null driftfile.
 +* Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.
 +* [Bug #629] changes to ensure broadcast works including on wildcard addresses
  * [Bug 853] get_node() must return a pointer to maximally-aligned memory.
  * Leap file fixes from Dave Mills.
  * [Bug 858] Recent leapfile changes broke without OPENSSL.
diff --cc ntpd/ntp_parser.y
index db662ff60,49f535703..b036560ab
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@@ -38,9 -38,8 +38,10 @@@
  
  
    struct FILE_INFO *ip_file;   /* Pointer to the configuration file stream */
 +
 +  #define YYERROR_VERBOSE
    void yyerror (char *msg);
+   extern int input_from_file;  /* 0=input from ntpq>config command buffer */
  
    /* SK: The following is a terrible hack to allow the NTP code to be built
     * without OPENSSL. The following symbols need to be defined in the