summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.56
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 35fe08531..d3eb1047a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 - markus@cvs.openbsd.org 2005/01/05 08:51:32 13 - markus@cvs.openbsd.org 2005/01/05 08:51:32
14 [sshconnect.c] 14 [sshconnect.c]
15 remove dead code, log connect() failures with level error, ok djm@ 15 remove dead code, log connect() failures with level error, ok djm@
16 - jmc@cvs.openbsd.org 2005/01/08 00:41:19
17 [sshd_config.5]
18 `login'(n) -> `log in'(v);
16 19
1720050118 2020050118
18 - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement 21 - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement
@@ -1985,4 +1988,4 @@
1985 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1988 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1986 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1989 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1987 1990
1988$Id: ChangeLog,v 1.3612 2005/01/20 00:00:46 dtucker Exp $ 1991$Id: ChangeLog,v 1.3613 2005/01/20 00:01:46 dtucker Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 07f91b6ed..e50b4bc4f 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.37 2004/12/23 23:11:00 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.38 2005/01/08 00:41:19 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
@@ -466,7 +466,7 @@ server allows login to accounts with empty password strings.
466The default is 466The default is
467.Dq no . 467.Dq no .
468.It Cm PermitRootLogin 468.It Cm PermitRootLogin
469Specifies whether root can login using 469Specifies whether root can log in using
470.Xr ssh 1 . 470.Xr ssh 1 .
471The argument must be 471The argument must be
472.Dq yes , 472.Dq yes ,
@@ -495,7 +495,7 @@ All other authentication methods are disabled for root.
495.Pp 495.Pp
496If this option is set to 496If this option is set to
497.Dq no 497.Dq no
498root is not allowed to login. 498root is not allowed to log in.
499.It Cm PermitUserEnvironment 499.It Cm PermitUserEnvironment
500Specifies whether 500Specifies whether
501.Pa ~/.ssh/environment 501.Pa ~/.ssh/environment