diff options
-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 @@ | |||
16 | - djm@cvs.openbsd.org 2011/05/23 03:52:55 | 16 | - djm@cvs.openbsd.org 2011/05/23 03:52:55 |
17 | [sshconnect.c] | 17 | [sshconnect.c] |
18 | remove extra newline | 18 | remove extra newline |
19 | - jmc@cvs.openbsd.org 2011/05/23 07:10:21 | ||
20 | [sshd.8 sshd_config.5] | ||
21 | tweak previous; ok djm | ||
19 | 22 | ||
20 | 20110520 | 23 | 20110520 |
21 | - (djm) [session.c] call setexeccon() before executing passwd for pw | 24 | - (djm) [session.c] call setexeccon() before executing passwd for pw |
@@ -33,7 +33,7 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd.8,v 1.261 2011/05/23 03:30:07 djm Exp $ | 36 | .\" $OpenBSD: sshd.8,v 1.262 2011/05/23 07:10:21 jmc Exp $ |
37 | .Dd $Mdocdate: May 23 2011 $ | 37 | .Dd $Mdocdate: May 23 2011 $ |
38 | .Dt SSHD 8 | 38 | .Dt SSHD 8 |
39 | .Os | 39 | .Os |
@@ -462,9 +462,9 @@ is run, and if that | |||
462 | does not exist either, xauth is used to add the cookie. | 462 | does not exist either, xauth is used to add the cookie. |
463 | .Sh AUTHORIZED_KEYS FILE FORMAT | 463 | .Sh AUTHORIZED_KEYS FILE FORMAT |
464 | .Cm AuthorizedKeysFile | 464 | .Cm AuthorizedKeysFile |
465 | specifies the file or files containing public keys for | 465 | specifies the files containing public keys for |
466 | public key authentication; | 466 | public key authentication; |
467 | if none is specified, the default is both | 467 | if none is specified, the default is |
468 | .Pa ~/.ssh/authorized_keys | 468 | .Pa ~/.ssh/authorized_keys |
469 | and | 469 | and |
470 | .Pa ~/.ssh/authorized_keys2 . | 470 | .Pa ~/.ssh/authorized_keys2 . |
diff --git a/sshd_config.5 b/sshd_config.5 index b23e0f789..70a53b3a9 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,7 +33,7 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.132 2011/05/23 03:30:07 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.133 2011/05/23 07:10:21 jmc Exp $ |
37 | .Dd $Mdocdate: May 23 2011 $ | 37 | .Dd $Mdocdate: May 23 2011 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -168,11 +168,9 @@ After expansion, | |||
168 | .Cm AuthorizedKeysFile | 168 | .Cm AuthorizedKeysFile |
169 | is taken to be an absolute path or one relative to the user's home | 169 | is taken to be an absolute path or one relative to the user's home |
170 | directory. | 170 | directory. |
171 | The default is both | 171 | Multiple files may be listed, separated by whitespace. |
172 | .Dq .ssh/authorized_keys | 172 | The default is |
173 | and | 173 | .Dq .ssh/authorized_keys .ssh/authorized_keys2 . |
174 | .Dq .ssh/authorized_keys2 . | ||
175 | Multiple files may be listed separated by whitespace. | ||
176 | .It Cm AuthorizedPrincipalsFile | 174 | .It Cm AuthorizedPrincipalsFile |
177 | Specifies a file that lists principal names that are accepted for | 175 | Specifies a file that lists principal names that are accepted for |
178 | certificate authentication. | 176 | certificate authentication. |