Module Name: src
Committed By: christos
Date: Mon Dec 30 17:42:20 UTC 2013
Modified Files:
src/external/bsd/ntp/dist/include: ntp_config.h
src/external/bsd/ntp/dist/ntpd: ntp_config.c ntp_parser.y
Log Message:
put back mdstries
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/include/ntp_config.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/ntp_parser.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/include/ntp_config.h
diff -u src/external/bsd/ntp/dist/include/ntp_config.h:1.4 src/external/bsd/ntp/dist/include/ntp_config.h:1.5
--- src/external/bsd/ntp/dist/include/ntp_config.h:1.4 Fri Dec 27 22:20:13 2013
+++ src/external/bsd/ntp/dist/include/ntp_config.h Mon Dec 30 12:42:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.h,v 1.4 2013/12/28 03:20:13 christos Exp $ */
+/* $NetBSD: ntp_config.h,v 1.5 2013/12/30 17:42:19 christos Exp $ */
#ifndef NTP_CONFIG_H
#define NTP_CONFIG_H
@@ -241,6 +241,7 @@ struct config_tree_tag {
int_fifo * reset_counters;
sim_fifo * sim_details;
+ int mdnstries;
};
Index: src/external/bsd/ntp/dist/ntpd/ntp_config.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.7 src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.8
--- src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.7 Sun Dec 29 20:34:22 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_config.c Mon Dec 30 12:42:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.c,v 1.7 2013/12/30 01:34:22 christos Exp $ */
+/* $NetBSD: ntp_config.c,v 1.8 2013/12/30 17:42:19 christos Exp $ */
/* ntp_config.c
*
@@ -316,6 +316,7 @@ static void config_ntpd(config_tree *);
static void config_other_modes(config_tree *);
static void config_auth(config_tree *);
static void config_access(config_tree *);
+static void config_mdnstries(config_tree *);
static void config_phone(config_tree *);
static void config_setvar(config_tree *);
static void config_ttl(config_tree *);
@@ -393,6 +394,7 @@ init_syntax_tree(
)
{
ZERO(*ptree);
+ ptree->mdnstries = 5;
}
@@ -3040,6 +3042,16 @@ config_phone(
}
#endif /* !SIM */
+static void
+config_mdnstries(
+ config_tree *ptree
+ )
+{
+#ifdef HAVE_DNSREGISTRATION
+ extern int mdnstries;
+ mdnstries = ptree->mdnstries;
+#endif /* HAVE_DNSREGISTRATION */
+}
#ifdef FREE_CFG_T
static void
@@ -4268,6 +4280,7 @@ config_ntpd(
config_system_opts(ptree);
config_logconfig(ptree);
config_phone(ptree);
+ config_mdnstries(ptree);
config_setvar(ptree);
config_ttl(ptree);
config_trap(ptree);
Index: src/external/bsd/ntp/dist/ntpd/ntp_parser.y
diff -u src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.6 src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.7
--- src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.6 Fri Dec 27 22:20:14 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_parser.y Mon Dec 30 12:42:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_parser.y,v 1.6 2013/12/28 03:20:14 christos Exp $ */
+/* $NetBSD: ntp_parser.y,v 1.7 2013/12/30 17:42:19 christos Exp $ */
/* ntp_parser.y
*
@@ -156,6 +156,7 @@
%token <Integer> T_Maxdist
%token <Integer> T_Maxmem
%token <Integer> T_Maxpoll
+%token <Integer> T_Mdnstries
%token <Integer> T_Mem
%token <Integer> T_Memlock
%token <Integer> T_Minclock
@@ -523,6 +524,8 @@ other_mode_command
{ CONCAT_G_FIFOS(cfgt.manycastserver, $2); }
| T_Multicastclient address_list
{ CONCAT_G_FIFOS(cfgt.multicastclient, $2); }
+ | T_Mdnstries T_Integer
+ { cfgt.mdnstries = $2; }
;
