summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-05-19 19:37:33 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-05-19 19:37:33 +1000
commitba9ea3200dcb4ec61033e41b666f9d1fbfa35bf9 (patch)
treeb5e13d3fe6036ffa2350c6440195e1504e1e212d
parentfbcf827559b38f7992e1bd0bcdc4b4ccdf63bc74 (diff)
- dtucker@cvs.openbsd.org 2012/05/19 06:30:30
[sshd_config.5] Document PermitOpen none. bz#2001, patch from Loganaden Velvindron
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config.57
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ed4b228c..1ffcdd174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 [servconf.h servconf.c sshd.8 sshd.c auth.c sshd_config.5] 9 [servconf.h servconf.c sshd.8 sshd.c auth.c sshd_config.5]
10 Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests 10 Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
11 to match. Feedback and ok djm@ markus@. 11 to match. Feedback and ok djm@ markus@.
12 - dtucker@cvs.openbsd.org 2012/05/19 06:30:30
13 [sshd_config.5]
14 Document PermitOpen none. bz#2001, patch from Loganaden Velvindron
12 15
1320120504 1620120504
14 - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h> 17 - (dtucker) [configure.ac] Include <sys/param.h> rather than <sys/types.h>
diff --git a/sshd_config.5 b/sshd_config.5
index 17df9e6cd..ddcf51f02 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd_config.5,v 1.139 2012/05/13 01:42:32 dtucker Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.140 2012/05/19 06:30:30 dtucker Exp $
37.Dd $Mdocdate: May 13 2012 $ 37.Dd $Mdocdate: May 19 2012 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -802,6 +802,9 @@ Multiple forwards may be specified by separating them with whitespace.
802An argument of 802An argument of
803.Dq any 803.Dq any
804can be used to remove all restrictions and permit any forwarding requests. 804can be used to remove all restrictions and permit any forwarding requests.
805An argument of
806.Dq none
807can be used to prohibit all forwarding requests.
805By default all port forwarding requests are permitted. 808By default all port forwarding requests are permitted.
806.It Cm PermitRootLogin 809.It Cm PermitRootLogin
807Specifies whether root can log in using 810Specifies whether root can log in using