Merge bk://www.ntp.org/ntp-dev

into  pogo.udel.edu:/pogo/users/neal/neal.ntp-dev

bk: 46777a1cf1Q1o49A735Ga8uevQB2_A

diff --cc ChangeLog
index 44c095016f97411dc851be6d028106c92129f540,77b0bba3c4d6698b007325677a317bdfdffd429f..7453dd2dab67701e6f38449138890ecb2d2af4e9
--- 1/ChangeLog
--- 2/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 db662ff6052d596d8122328e188863e4de7b49d9,49f53570327fb51cb7cd1472e706c8a43268e3c0..b036560abedf8815a8be000ff38186f5b440d120
--- 1/ntpd/ntp_parser.y
--- 2/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