[src/trunk]: src/usr.sbin/rtadvd Fix the default value of rltime

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5f2d93fbfcf2
branches:  trunk
changeset: 822033:5f2d93fbfcf2
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Feb 27 05:41:36 2017 +0000

description:
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 66411c3ae7fd -r 5f2d93fbfcf2 usr.sbin/rtadvd/config.c
--- a/usr.sbin/rtadvd/config.c  Mon Feb 27 03:37:16 2017 +0000
+++ b/usr.sbin/rtadvd/config.c  Mon Feb 27 05:41:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.c,v 1.35 2015/11/11 07:48:41 ozaki-r Exp $      */
+/*     $NetBSD: config.c,v 1.36 2017/02/27 05:41:36 ozaki-r Exp $      */
 /*     $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $    */
 
 /*
@@ -305,7 +305,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 66411c3ae7fd -r 5f2d93fbfcf2 usr.sbin/rtadvd/rtadvd.h
--- a/usr.sbin/rtadvd/rtadvd.h  Mon Feb 27 03:37:16 2017 +0000
+++ b/usr.sbin/rtadvd/rtadvd.h  Mon Feb 27 05:41:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtadvd.h,v 1.14 2015/06/05 14:09:20 roy Exp $  */
+/*     $NetBSD: rtadvd.h,v 1.15 2017/02/27 05:41:36 ozaki-r 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