[Bug 1761] clockstuff/clktest-opts.h omitted from tarball.

bk: 4d0f0ff0Q_v87GJqdCGKggs96I1Ogw

diff --git a/ChangeLog b/ChangeLog
index 5384136adce09500caab2138057084836f1be713..8bc94727ee12ff76b1c5963a752b6df103762113 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1761] clockstuff/clktest-opts.h omitted from tarball.
 * [Bug 1762] from 4.2.6p3-RC12: manycastclient responses interfere.
 (4.2.7p97) 2010/12/19 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1458] from 4.2.6p3-RC12: Can not compile NTP on FreeBSD 4.7.

diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am
index b97a3641ed2c81e3185ea2d14a34eb40ff031089..0ab3cfa7fe1265a7768c9b154523267f9f3a620f 100644 (file)
--- a/clockstuff/Makefile.am
+++ b/clockstuff/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_PROGRAMS = propdelay chutest clktest
 BUILT_SOURCES =        clktest-opts.c clktest-opts.h
 EXTRA_DIST = clktest-opts.def
 
-clktest_SOURCES = clktest.c clktest-opts.c
+clktest_SOURCES = clktest.c clktest-opts.c clktest-opts.h
 
 INCLUDES =  -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include
 INCLUDES += -I$(top_srcdir)/lib/isc/nothreads/include

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index d87ccc0f695b5b7cad40052e47b38dbf705491d5..10888c8139bd09b2f5f6f7081986f6175e8d8c24 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -3352,6 +3352,10 @@ config_vars(
                                stats_config(STATS_FREQ_FILE, curr_var->value.s);
                        break;
 
+               case T_Ident:
+                       DPRINTF(1, ("DLM: ident %s\n", curr_var->value.s));
+                       break;
+
                case T_WanderThreshold:         /* FALLTHROUGH */
                case T_Nonvolatile:
                        wander_threshold = curr_var->value.d;

diff --git a/ntpd/ntp_parser.y b/ntpd/ntp_parser.y
index 9cd2800d1a9f3cffe893d84c73f007718ba92bd2..b4b47e8934a4f2871b574eb66cfd89922ad75595 100644 (file)
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@ -1112,7 +1112,8 @@ misc_cmd_dbl_keyword
        ;
 
 misc_cmd_str_keyword
-       :       T_Leapfile
+       :       T_Ident
+       |       T_Leapfile
        |       T_Pidfile
        |       T_Qos
        ;