[src/trunk]: src/external/bsd/ntp/dist put back mdstries

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa01a46c2392
branches:  trunk
changeset: 325588:aa01a46c2392
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 30 17:42:19 2013 +0000

description:
put back mdstries

diffstat:

 external/bsd/ntp/dist/include/ntp_config.h |   3 ++-
 external/bsd/ntp/dist/ntpd/ntp_config.c    |  15 ++++++++++++++-
 external/bsd/ntp/dist/ntpd/ntp_parser.y    |   5 ++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (93 lines):

diff -r 886a861fc102 -r aa01a46c2392 external/bsd/ntp/dist/include/ntp_config.h
--- a/external/bsd/ntp/dist/include/ntp_config.h        Mon Dec 30 17:41:57 2013 +0000
+++ b/external/bsd/ntp/dist/include/ntp_config.h        Mon Dec 30 17:42:19 2013 +0000
@@ -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 @@
        int_fifo *      reset_counters;
 
        sim_fifo *      sim_details;
+       int             mdnstries;
 };
 
 
diff -r 886a861fc102 -r aa01a46c2392 external/bsd/ntp/dist/ntpd/ntp_config.c
--- a/external/bsd/ntp/dist/ntpd/ntp_config.c   Mon Dec 30 17:41:57 2013 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_config.c   Mon Dec 30 17:42:19 2013 +0000
@@ -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_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 @@
        )
 {
        ZERO(*ptree);
+       ptree->mdnstries = 5;
 }
 
 
@@ -3040,6 +3042,16 @@
 }
 #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_system_opts(ptree);
        config_logconfig(ptree);
        config_phone(ptree);
+       config_mdnstries(ptree);
        config_setvar(ptree);
        config_ttl(ptree);
        config_trap(ptree);
diff -r 886a861fc102 -r aa01a46c2392 external/bsd/ntp/dist/ntpd/ntp_parser.y
--- a/external/bsd/ntp/dist/ntpd/ntp_parser.y   Mon Dec 30 17:41:57 2013 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_parser.y   Mon Dec 30 17:42:19 2013 +0000
@@ -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 @@
                        { CONCAT_G_FIFOS(cfgt.manycastserver, $2); }
        |       T_Multicastclient address_list
                        { CONCAT_G_FIFOS(cfgt.multicastclient, $2); }
+       |       T_Mdnstries T_Integer
+                       { cfgt.mdnstries = $2; }
        ;