From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Dec 2010 08:12:32 +0000 (+0000)
Subject: [Bug 1761] clockstuff/clktest-opts.h omitted from tarball.
X-Git-Tag: NTP_4_2_7P98~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b7802f9241124e5af827a9db5ff1163d0fad2a5;p=thirdparty%2Fntp.git

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

bk: 4d0f0ff0Q_v87GJqdCGKggs96I1Ogw
---

diff --git a/ChangeLog b/ChangeLog
index 5384136ad..8bc94727e 100644
--- 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 b97a3641e..0ab3cfa7f 100644
--- 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 d87ccc0f6..10888c813 100644
--- 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 9cd2800d1..b4b47e893 100644
--- 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
 	;