diff options
| author | Damien Miller <djm@mindrot.org> | 2011-05-29 21:41:40 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-05-29 21:41:40 +1000 |
| commit | b9132fc42717152cdb222a01595a4e6c04e257b3 (patch) | |
| tree | 563a4408e0c0e1005b706980aec0a2b6498d1ba6 | |
| parent | 201f425d298d3c1c43fac122e2e0bcbf7a707939 (diff) | |
- jmc@cvs.openbsd.org 2011/05/23 07:10:21
[sshd.8 sshd_config.5]
tweak previous; ok djm
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sshd.8 | 6 | ||||
| -rw-r--r-- | sshd_config.5 | 10 |
3 files changed, 10 insertions, 9 deletions
@@ -16,6 +16,9 @@ - djm@cvs.openbsd.org 2011/05/23 03:52:55 [sshconnect.c] remove extra newline + - jmc@cvs.openbsd.org 2011/05/23 07:10:21 + [sshd.8 sshd_config.5] + tweak previous; ok djm 20110520 - (djm) [session.c] call setexeccon() before executing passwd for pw @@ -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 @@ -462,9 +462,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/sshd_config.5 b/sshd_config.5 index b23e0f78..70a53b3a 100644 --- a/sshd_config.5 +++ b/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. |