summaryrefslogtreecommitdiffstats
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 2e28a43f..bde3e384 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,9 @@
Note that users can still use external forwarders such as netcat,
so to be those must be controlled too for the limits to be effective.
Feedback & ok djm@, man page corrections & ok jmc@.
+ - jmc@cvs.openbsd.org 2006/07/18 07:50:40
+ [sshd_config.5]
+ tweak; ok dtucker
20060713
- (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4955,4 +4958,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4415 2006/07/24 04:04:00 djm Exp $
+$Id: ChangeLog,v 1.4416 2006/07/24 04:04:16 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index c9515234..5f14f201 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.62 2006/07/17 12:06:00 dtucker Exp $
+.\" $OpenBSD: sshd_config.5,v 1.63 2006/07/18 07:50:40 jmc Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -553,7 +553,7 @@ are permitted.
An argument of
.Dq any
can be used to remove all restrictions and permit any forwarding requests.
-By default all port forward requests are permitted.
+By default all port forwarding requests are permitted.
.It Cm PermitRootLogin
Specifies whether root can log in using
.Xr ssh 1 .