diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2011-05-23 07:10:22 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2011-05-23 07:10:22 +0000 |
| commit | 8fd65856d905db6d66ef31fc2c5b99034f14dbf2 (patch) | |
| tree | abb11640e88cd24751c54c0b9e8b623a2e63c7a8 /usr.bin | |
| parent | 8af7a10ed003623cb190f36c11011f7508bd6385 (diff) | |
tweak previous; ok djm
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/sshd.8 | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index 3ca4c409f29..817219e7fd9 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/sshd.8 @@ -33,7 +33,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.8,v 1.261 2011/05/23 03:30:07 djm Exp $ +.\" $OpenBSD: sshd.8,v 1.262 2011/05/23 07:10:21 jmc Exp $ .Dd $Mdocdate: May 23 2011 $ .Dt SSHD 8 .Os @@ -435,9 +435,9 @@ is run, and if that does not exist either, xauth is used to add the cookie. .Sh AUTHORIZED_KEYS FILE FORMAT .Cm AuthorizedKeysFile -specifies the file or files containing public keys for +specifies the files containing public keys for public key authentication; -if none is specified, the default is both +if none is specified, the default is .Pa ~/.ssh/authorized_keys and .Pa ~/.ssh/authorized_keys2 . diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index 4f584996507..69de8d4d2b9 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -33,7 +33,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.132 2011/05/23 03:30:07 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.133 2011/05/23 07:10:21 jmc Exp $ .Dd $Mdocdate: May 23 2011 $ .Dt SSHD_CONFIG 5 .Os @@ -168,11 +168,9 @@ After expansion, .Cm AuthorizedKeysFile is taken to be an absolute path or one relative to the user's home directory. -The default is both -.Dq .ssh/authorized_keys -and -.Dq .ssh/authorized_keys2 . -Multiple files may be listed separated by whitespace. +Multiple files may be listed, separated by whitespace. +The default is +.Dq .ssh/authorized_keys .ssh/authorized_keys2 . .It Cm AuthorizedPrincipalsFile Specifies a file that lists principal names that are accepted for certificate authentication. |