diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-05-06 12:58:01 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-05-06 12:58:01 +0000 |
| commit | 4d9f0eb769fe12a4faf5c55b2ce36a8165ba83fe (patch) | |
| tree | 766b227ac8dbeb75364d80e6b74fddb24b10b821 /usr.sbin | |
| parent | d35485199436046adae01d0cc938cbe8d63e4de4 (diff) | |
the manpage mentioned "timeout" in relay sections, while the grammar
expected the keywords "forward timeout". rename it to "session
timeout" and sync the documentation with reality.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/relayd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/relayd/relayd.conf.5 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index a5c214af627..85970a84a46 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.111 2008/05/06 06:09:48 pyr Exp $ */ +/* $OpenBSD: parse.y,v 1.112 2008/05/06 12:58:00 reyk Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -1106,7 +1106,7 @@ relayoptsl : LISTEN ON STRING port optssl { tableport = h->port; } | FORWARD TO forwardspec - | FORWARD TIMEOUT NUMBER { + | SESSION TIMEOUT NUMBER { if ((rlay->rl_conf.timeout.tv_sec = $3) < 0) { yyerror("invalid timeout: %d", $3); YYERROR; diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5 index 0c73c162844..a3fb906a546 100644 --- a/usr.sbin/relayd/relayd.conf.5 +++ b/usr.sbin/relayd/relayd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: relayd.conf.5,v 1.81 2008/05/06 12:24:12 reyk Exp $ +.\" $OpenBSD: relayd.conf.5,v 1.82 2008/05/06 12:58:00 reyk Exp $ .\" .\" Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org> .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -528,7 +528,7 @@ The generic TCP protocol options will be used by default; see the .Sx PROTOCOLS section below. -.It Ic timeout Ar seconds +.It Ic session timeout Ar seconds Specify the timeout in seconds for accepted sessions. The default timeout is 600 seconds (10 minutes). .El |