summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sshd.86
-rw-r--r--sshd_config.57
2 files changed, 8 insertions, 5 deletions
diff --git a/sshd.8 b/sshd.8
index 213b5fc43..3b20d9f32 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
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.280 2015/07/03 03:49:45 djm Exp $ 36.\" $OpenBSD: sshd.8,v 1.281 2015/09/11 03:13:36 djm Exp $
37.Dd $Mdocdate: July 3 2015 $ 37.Dd $Mdocdate: September 11 2015 $
38.Dt SSHD 8 38.Dt SSHD 8
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -470,7 +470,7 @@ does not exist either, xauth is used to add the cookie.
470.Cm AuthorizedKeysFile 470.Cm AuthorizedKeysFile
471specifies the files containing public keys for 471specifies the files containing public keys for
472public key authentication; 472public key authentication;
473if none is specified, the default is 473if this option is not specified, the default is
474.Pa ~/.ssh/authorized_keys 474.Pa ~/.ssh/authorized_keys
475and 475and
476.Pa ~/.ssh/authorized_keys2 . 476.Pa ~/.ssh/authorized_keys2 .
diff --git a/sshd_config.5 b/sshd_config.5
index b18d340af..cd3b5cfe3 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
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.211 2015/08/14 15:32:41 jmc Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.212 2015/09/11 03:13:36 djm Exp $
37.Dd $Mdocdate: August 14 2015 $ 37.Dd $Mdocdate: September 11 2015 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -285,6 +285,9 @@ After expansion,
285is taken to be an absolute path or one relative to the user's home 285is taken to be an absolute path or one relative to the user's home
286directory. 286directory.
287Multiple files may be listed, separated by whitespace. 287Multiple files may be listed, separated by whitespace.
288Alternately this option may be set to
289.Dq none
290to skip checking for user keys in files.
288The default is 291The default is
289.Dq .ssh/authorized_keys .ssh/authorized_keys2 . 292.Dq .ssh/authorized_keys .ssh/authorized_keys2 .
290.It Cm AuthorizedPrincipalsCommand 293.It Cm AuthorizedPrincipalsCommand