summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 07:40:40 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 07:40:40 +0000
commit323c98f4a761b8ac79a7ffddca6a97f7f4c93a23 (patch)
treeec44dd5cf8a9371ef8f85f0926c2485febb47c35
parent3d73a349313161770a5a37f02d6a8edff40c597a (diff)
- stevesk@cvs.openbsd.org 2001/03/04 11:04:41
[sshd.8] small cleanup and clarify for PermitRootLogin; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--sshd.88
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 90d0c9d7e..9ef16f5ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,6 +150,9 @@
150 - stevesk@cvs.openbsd.org 2001/03/04 10:57:53 150 - stevesk@cvs.openbsd.org 2001/03/04 10:57:53
151 [ssh.c] 151 [ssh.c]
152 add -m to usage; ok markus@ 152 add -m to usage; ok markus@
153 - stevesk@cvs.openbsd.org 2001/03/04 11:04:41
154 [sshd.8]
155 small cleanup and clarify for PermitRootLogin; ok markus@
153 156
15420010304 15720010304
155 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 158 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4342,4 +4345,4 @@
4342 - Wrote replacements for strlcpy and mkdtemp 4345 - Wrote replacements for strlcpy and mkdtemp
4343 - Released 1.0pre1 4346 - Released 1.0pre1
4344 4347
4345$Id: ChangeLog,v 1.898 2001/03/05 07:39:01 mouring Exp $ 4348$Id: ChangeLog,v 1.899 2001/03/05 07:40:40 mouring Exp $
diff --git a/sshd.8 b/sshd.8
index ab012b450..fadfe6ba3 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.8,v 1.99 2001/03/02 18:54:31 deraadt Exp $ 37.\" $OpenBSD: sshd.8,v 1.100 2001/03/04 11:04:41 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -550,7 +550,7 @@ server allows login to accounts with empty password strings.
550The default is 550The default is
551.Dq no . 551.Dq no .
552.It Cm PermitRootLogin 552.It Cm PermitRootLogin
553Specifies whether the root can log in using 553Specifies whether root can login using
554.Xr ssh 1 . 554.Xr ssh 1 .
555The argument must be 555The argument must be
556.Dq yes , 556.Dq yes ,
@@ -574,6 +574,10 @@ option has been specified
574(which may be useful for taking remote backups even if root login is 574(which may be useful for taking remote backups even if root login is
575normally not allowed). All other authentication methods are disabled 575normally not allowed). All other authentication methods are disabled
576for root. 576for root.
577.Pp
578If this option is set to
579.Dq no
580root is not allowed to login.
577.It Cm PidFile 581.It Cm PidFile
578Specifies the file that contains the process identifier of the 582Specifies the file that contains the process identifier of the
579.Nm 583.Nm