RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

more clarity on what AuthorizedKeysFile=none does; based
 on diff by Thiebaud Weksteen

Upstream-ID: 78ab87f069080f0cc3bc353bb04eddd9e8ad3704
This commit is contained in:
djm@openbsd.org 2015-09-11 03:13:36 +00:00 committed by Damien Miller
parent 61942ea4a0
commit 2bca8a43e7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sshd.8
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd.8,v 1.280 2015/07/03 03:49:45 djm Exp $ .\" $OpenBSD: sshd.8,v 1.281 2015/09/11 03:13:36 djm Exp $
.Dd $Mdocdate: July 3 2015 $ .Dd $Mdocdate: September 11 2015 $
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
.Sh NAME .Sh NAME
@ -470,7 +470,7 @@ does not exist either, xauth is used to add the cookie.
.Cm AuthorizedKeysFile .Cm AuthorizedKeysFile
specifies the files containing public keys for specifies the files containing public keys for
public key authentication; public key authentication;
if none is specified, the default is if this option is not specified, the default is
.Pa ~/.ssh/authorized_keys .Pa ~/.ssh/authorized_keys
and and
.Pa ~/.ssh/authorized_keys2 . .Pa ~/.ssh/authorized_keys2 .

7
sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.211 2015/08/14 15:32:41 jmc Exp $ .\" $OpenBSD: sshd_config.5,v 1.212 2015/09/11 03:13:36 djm Exp $
.Dd $Mdocdate: August 14 2015 $ .Dd $Mdocdate: September 11 2015 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -285,6 +285,9 @@ After expansion,
is taken to be an absolute path or one relative to the user's home is taken to be an absolute path or one relative to the user's home
directory. directory.
Multiple files may be listed, separated by whitespace. Multiple files may be listed, separated by whitespace.
Alternately this option may be set to
.Dq none
to skip checking for user keys in files.
The default is The default is
.Dq .ssh/authorized_keys .ssh/authorized_keys2 . .Dq .ssh/authorized_keys .ssh/authorized_keys2 .
.It Cm AuthorizedPrincipalsCommand .It Cm AuthorizedPrincipalsCommand