summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd.86
-rw-r--r--sshd_config.510
3 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 75a88fd04..acf4ea270 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
2020110520 2320110520
21 - (djm) [session.c] call setexeccon() before executing passwd for pw 24 - (djm) [session.c] call setexeccon() before executing passwd for pw
diff --git a/sshd.8 b/sshd.8
index 8e007d100..45362e29a 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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
462does not exist either, xauth is used to add the cookie. 462does 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
465specifies the file or files containing public keys for 465specifies the files containing public keys for
466public key authentication; 466public key authentication;
467if none is specified, the default is both 467if none is specified, the default is
468.Pa ~/.ssh/authorized_keys 468.Pa ~/.ssh/authorized_keys
469and 469and
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
169is taken to be an absolute path or one relative to the user's home 169is taken to be an absolute path or one relative to the user's home
170directory. 170directory.
171The default is both 171Multiple files may be listed, separated by whitespace.
172.Dq .ssh/authorized_keys 172The default is
173and 173.Dq .ssh/authorized_keys .ssh/authorized_keys2 .
174.Dq .ssh/authorized_keys2 .
175Multiple files may be listed separated by whitespace.
176.It Cm AuthorizedPrincipalsFile 174.It Cm AuthorizedPrincipalsFile
177Specifies a file that lists principal names that are accepted for 175Specifies a file that lists principal names that are accepted for
178certificate authentication. 176certificate authentication.