summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorPeter Hessler <phessler@cvs.openbsd.org>2023-04-27 16:56:53 +0000
committerPeter Hessler <phessler@cvs.openbsd.org>2023-04-27 16:56:53 +0000
commit34736d3f5f7a63364588e653f04545ab42ba75d9 (patch)
tree7ecdf6b401b2652d759504ad8162d55a724102e1 /usr.sbin
parent57e6300850cc7318dc8b822d7ea82b5d6f1473c5 (diff)
RFC 9096 changes the default timers for prefix preferred and valid lifetimes,
so update rad(8) to the new ones. OK florian@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/rad/rad.conf.58
-rw-r--r--usr.sbin/rad/rad.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/rad/rad.conf.5 b/usr.sbin/rad/rad.conf.5
index 6bd743b54b8..3f71a9aeee9 100644
--- a/usr.sbin/rad/rad.conf.5
+++ b/usr.sbin/rad/rad.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rad.conf.5,v 1.20 2022/10/15 15:18:15 jmc Exp $
+.\" $OpenBSD: rad.conf.5,v 1.21 2023/04/27 16:56:52 phessler Exp $
.\"
.\" Copyright (c) 2018 Florian Obser <florian@openbsd.org>
.\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: October 15 2022 $
+.Dd $Mdocdate: April 27 2023 $
.Dt RAD.CONF 5
.Os
.Sh NAME
@@ -159,11 +159,11 @@ The default is yes.
.It Ic preferred lifetime Ar seconds
The preferred lifetime (pltime) in seconds for addresses generated from this
prefix.
-The default is 604800.
+The default is 2700.
.It Ic valid lifetime Ar seconds
The valid lifetime (vltime) in seconds for addresses generated from this
prefix.
-The default is 2592000.
+The default is 5400.
.El
.Sh FILES
.Bl -tag -width /etc/examples/rad.conf -compact
diff --git a/usr.sbin/rad/rad.h b/usr.sbin/rad/rad.h
index e939ec091e2..714bb93765a 100644
--- a/usr.sbin/rad/rad.h
+++ b/usr.sbin/rad/rad.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rad.h,v 1.24 2022/12/28 21:30:18 jmc Exp $ */
+/* $OpenBSD: rad.h,v 1.25 2023/04/27 16:56:52 phessler Exp $ */
/*
* Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -29,8 +29,8 @@
#define MAX_RTR_ADV_INTERVAL 600
#define MIN_RTR_ADV_INTERVAL 200
#define ADV_DEFAULT_LIFETIME 3 * MAX_RTR_ADV_INTERVAL
-#define ADV_PREFERRED_LIFETIME 604800 /* 7 days */
-#define ADV_VALID_LIFETIME 2592000 /* 30 days */
+#define ADV_PREFERRED_LIFETIME 2700 /* 45 minutes */
+#define ADV_VALID_LIFETIME 5400 /* 90 minutes */
#define MAX_RA_DELAY_TIME 500 /* 500 milliseconds */
#define MIN_DELAY_BETWEEN_RAS 3 /* 3 seconds */
#define MAX_SEARCH 1025 /* MAXDNAME in arpa/nameser.h */