Module Name: src Committed By: snj Date: Fri May 12 05:08:00 UTC 2017
Modified Files: src/usr.sbin/rtadvd [netbsd-7-1]: config.c rtadvd.h Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.33.14.1 src/usr.sbin/rtadvd/config.c cvs rdiff -u -r1.13 -r1.13.12.1 src/usr.sbin/rtadvd/rtadvd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/rtadvd/config.c diff -u src/usr.sbin/rtadvd/config.c:1.33 src/usr.sbin/rtadvd/config.c:1.33.14.1 --- src/usr.sbin/rtadvd/config.c:1.33 Thu Jan 24 19:55:28 2013 +++ src/usr.sbin/rtadvd/config.c Fri May 12 05:08:00 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: config.c,v 1.33 2013/01/24 19:55:28 christos Exp $ */ +/* $NetBSD: config.c,v 1.33.14.1 2017/05/12 05:08:00 snj Exp $ */ /* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */ /* @@ -304,7 +304,7 @@ getconfig(const char *intface, int exith 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 " Index: src/usr.sbin/rtadvd/rtadvd.h diff -u src/usr.sbin/rtadvd/rtadvd.h:1.13 src/usr.sbin/rtadvd/rtadvd.h:1.13.12.1 --- src/usr.sbin/rtadvd/rtadvd.h:1.13 Tue Jul 9 09:34:59 2013 +++ src/usr.sbin/rtadvd/rtadvd.h Fri May 12 05:08:00 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: rtadvd.h,v 1.13 2013/07/09 09:34:59 roy Exp $ */ +/* $NetBSD: rtadvd.h,v 1.13.12.1 2017/05/12 05:08:00 snj Exp $ */ /* $KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $ */ /* @@ -52,6 +52,7 @@ extern struct sockaddr_in6 sin6_siteloca #define DEF_ADVCURHOPLIMIT 64 #define DEF_ADVVALIDLIFETIME 2592000 #define DEF_ADVPREFERREDLIFETIME 604800 +#define DEF_ADVROUTERLIFETIME 1800 #define MAXROUTERLIFETIME 9000 #define MIN_MAXINTERVAL 4