diff options
author | des <des@FreeBSD.org> | 2002-06-29 10:55:18 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-06-29 10:55:18 +0000 |
commit | 3f22fbc9c3472ff09e47296fdc105cae123caea9 (patch) | |
tree | 1fedd42dcd6fb1e96a7cce0697266bb85dc89d46 | |
parent | 3e4ef54c7b6ad4118fc6449e56f062f82d95a545 (diff) | |
download | FreeBSD-src-3f22fbc9c3472ff09e47296fdc105cae123caea9.zip FreeBSD-src-3f22fbc9c3472ff09e47296fdc105cae123caea9.tar.gz |
Document FreeBSD defaults.
Sponsored by: DARPA, NAI Labs
-rw-r--r-- | crypto/openssh/ssh_config | 2 | ||||
-rw-r--r-- | crypto/openssh/sshd_config | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index ef31d43..f7c1dea 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -1,4 +1,5 @@ # $OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $ +# $FreeBSD$ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for @@ -33,3 +34,4 @@ # Cipher 3des # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc # EscapeChar ~ +# VersionAddendum FreeBSD-20020625 diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index d57346b..8ef8bbb 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -1,4 +1,5 @@ # $OpenBSD: sshd_config,v 1.56 2002/06/20 23:37:12 markus Exp $ +# $FreeBSD$ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -10,6 +11,11 @@ # possible, but leave them commented. Uncommented options change a # default value. +# Note that some of FreeBSD's defaults differ from OpenBSD's, and +# FreeBSD has a few additional options. + +#VersionAddendum FreeBSD-20020625 + #Port 22 #Protocol 2,1 #ListenAddress 0.0.0.0 @@ -32,8 +38,8 @@ # Authentication: -#LoginGraceTime 600 -#PermitRootLogin yes +#LoginGraceTime 120 +#PermitRootLogin no #StrictModes yes #RSAAuthentication yes @@ -73,7 +79,7 @@ # Warning: enabling this may bypass the setting of 'PasswordAuthentication' #PAMAuthenticationViaKbdInt yes -#X11Forwarding no +#X11Forwarding yes #X11DisplayOffset 10 #X11UseLocalhost yes #PrintMotd yes |