[src/netbsd-7-0]: src/usr.sbin/rtadvd Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/a546fa636c28
branches:  netbsd-7-0
changeset: 801316:a546fa636c28
user:      snj <snj%NetBSD.org@localhost>
date:      Fri May 12 05:09:47 2017 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #1373):
        usr.sbin/rtadvd/config.c: revision 1.36
        usr.sbin/rtadvd/rtadvd.h: revision 1.15
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994

diffstat:

 usr.sbin/rtadvd/config.c |  4 ++--
 usr.sbin/rtadvd/rtadvd.h |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r f153ad343eb5 -r a546fa636c28 usr.sbin/rtadvd/config.c
--- a/usr.sbin/rtadvd/config.c  Wed Apr 26 14:58:53 2017 +0000
+++ b/usr.sbin/rtadvd/config.c  Fri May 12 05:09:47 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.c,v 1.33 2013/01/24 19:55:28 christos Exp $     */
+/*     $NetBSD: config.c,v 1.33.10.1 2017/05/12 05:09:47 snj Exp $     */
 /*     $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $    */
 
 /*
@@ -304,7 +304,7 @@
                goto errexit;
        }
 
-       MAYHAVE(val, "rltime", tmp->maxinterval * 3);
+       MAYHAVE(val, "rltime", DEF_ADVROUTERLIFETIME);
        if (val && (val < tmp->maxinterval || val > MAXROUTERLIFETIME)) {
                syslog(LOG_ERR,
                       "<%s> router lifetime (%d) on %s is invalid "
diff -r f153ad343eb5 -r a546fa636c28 usr.sbin/rtadvd/rtadvd.h
--- a/usr.sbin/rtadvd/rtadvd.h  Wed Apr 26 14:58:53 2017 +0000
+++ b/usr.sbin/rtadvd/rtadvd.h  Fri May 12 05:09:47 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtadvd.h,v 1.13 2013/07/09 09:34:59 roy Exp $  */
+/*     $NetBSD: rtadvd.h,v 1.13.8.1 2017/05/12 05:09:47 snj Exp $      */
 /*     $KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $    */
 
 /*
@@ -52,6 +52,7 @@
 #define DEF_ADVCURHOPLIMIT 64
 #define DEF_ADVVALIDLIFETIME 2592000
 #define DEF_ADVPREFERREDLIFETIME 604800
+#define DEF_ADVROUTERLIFETIME 1800
 
 #define MAXROUTERLIFETIME 9000
 #define MIN_MAXINTERVAL 4