Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/usr.sbin/rtadvd Pull up following revision(s) (requested ...
details: https://anonhg.NetBSD.org/src/rev/4688356d561e
branches: netbsd-6
changeset: 777186:4688356d561e
user: snj <snj%NetBSD.org@localhost>
date: Fri Jul 14 06:19:58 2017 +0000
description:
Pull up following revision(s) (requested by ozaki-r in ticket #1440):
usr.sbin/rtadvd/rtadvd.h: revision 1.15
usr.sbin/rtadvd/config.c: revision 1.36
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 0ca8a596f945 -r 4688356d561e usr.sbin/rtadvd/config.c
--- a/usr.sbin/rtadvd/config.c Fri Jul 14 06:18:25 2017 +0000
+++ b/usr.sbin/rtadvd/config.c Fri Jul 14 06:19:58 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.27.2.1 2012/08/08 15:37:49 martin Exp $ */
+/* $NetBSD: config.c,v 1.27.2.2 2017/07/14 06:19:58 snj Exp $ */
/* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -229,7 +229,7 @@
exit(1);
}
- 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 0ca8a596f945 -r 4688356d561e usr.sbin/rtadvd/rtadvd.h
--- a/usr.sbin/rtadvd/rtadvd.h Fri Jul 14 06:18:25 2017 +0000
+++ b/usr.sbin/rtadvd/rtadvd.h Fri Jul 14 06:19:58 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtadvd.h,v 1.11 2011/12/10 19:14:29 roy Exp $ */
+/* $NetBSD: rtadvd.h,v 1.11.2.1 2017/07/14 06:19:58 snj Exp $ */
/* $KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -50,6 +50,7 @@
#define DEF_ADVCURHOPLIMIT 64
#define DEF_ADVVALIDLIFETIME 2592000
#define DEF_ADVPREFERREDLIFETIME 604800
+#define DEF_ADVROUTERLIFETIME 1800
#define MAXROUTERLIFETIME 9000
#define MIN_MAXINTERVAL 4
Home |
Main Index |
Thread Index |
Old Index