summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-07-24 14:04:16 +1000
committerDamien Miller <djm@mindrot.org>2006-07-24 14:04:16 +1000
commit65bc2c402871ef0603b1f99afb323da953212232 (patch)
tree8d5e620d7643b6fc53af1584eeadb91ae466fecf
parent9b439df18a9d56683584811ce38dcf72acd4cb20 (diff)
- jmc@cvs.openbsd.org 2006/07/18 07:50:40
[sshd_config.5] tweak; ok dtucker
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.54
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e28a43f8..bde3e3843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,9 @@
37 Note that users can still use external forwarders such as netcat, 37 Note that users can still use external forwarders such as netcat,
38 so to be those must be controlled too for the limits to be effective. 38 so to be those must be controlled too for the limits to be effective.
39 Feedback & ok djm@, man page corrections & ok jmc@. 39 Feedback & ok djm@, man page corrections & ok jmc@.
40 - jmc@cvs.openbsd.org 2006/07/18 07:50:40
41 [sshd_config.5]
42 tweak; ok dtucker
40 43
4120060713 4420060713
42 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h 45 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4955,4 +4958,4 @@
4955 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4958 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4956 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4959 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4957 4960
4958$Id: ChangeLog,v 1.4415 2006/07/24 04:04:00 djm Exp $ 4961$Id: ChangeLog,v 1.4416 2006/07/24 04:04:16 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index c9515234d..5f14f2017 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.62 2006/07/17 12:06:00 dtucker Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.63 2006/07/18 07:50:40 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -553,7 +553,7 @@ are permitted.
553An argument of 553An argument of
554.Dq any 554.Dq any
555can be used to remove all restrictions and permit any forwarding requests. 555can be used to remove all restrictions and permit any forwarding requests.
556By default all port forward requests are permitted. 556By default all port forwarding requests are permitted.
557.It Cm PermitRootLogin 557.It Cm PermitRootLogin
558Specifies whether root can log in using 558Specifies whether root can log in using
559.Xr ssh 1 . 559.Xr ssh 1 .