From f33580eed055472b9e5ca05f4826b05e9eacc651 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 4 Nov 2012 22:22:52 +1100 Subject: - OpenBSD CVS Sync - jmc@cvs.openbsd.org 2012/10/31 08:04:50 [sshd_config.5] tweak previous; --- ChangeLog | 6 ++++++ sshd_config.5 | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27ec898b8..f1d0580fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20121104 + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2012/10/31 08:04:50 + [sshd_config.5] + tweak previous; + 20121030 - (djm) OpenBSD CVS Sync - markus@cvs.openbsd.org 2012/10/05 12:34:39 diff --git a/sshd_config.5 b/sshd_config.5 index de8f0f825..3cc901a82 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,8 +33,8 @@ .\" (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.146 2012/10/30 21:29:55 djm Exp $ -.Dd $Mdocdate: October 30 2012 $ +.\" $OpenBSD: sshd_config.5,v 1.147 2012/10/31 08:04:50 jmc Exp $ +.Dd $Mdocdate: October 31 2012 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -152,11 +152,13 @@ in .Xr ssh_config 5 for more information on patterns. .It Cm AuthorizedKeysCommand -Specifies a program to be used for lookup of the user's public keys. +Specifies a program to be used to look up the user's public keys. The program will be invoked with a single argument of the username being authenticated, and should produce on standard output zero or -more lines of authorized_keys output (see AUTHORIZED_KEYS in -.Xr sshd 8 ) +more lines of authorized_keys output (see +.Sx AUTHORIZED_KEYS +in +.Xr sshd 8 ) . If a key supplied by AuthorizedKeysCommand does not successfully authenticate and authorize the user then public key authentication continues using the usual .Cm AuthorizedKeysFile @@ -727,9 +729,9 @@ Available keywords are .Cm AllowGroups , .Cm AllowTcpForwarding , .Cm AllowUsers , -.Cm AuthorizedKeysFile , .Cm AuthorizedKeysCommand , .Cm AuthorizedKeysCommandUser , +.Cm AuthorizedKeysFile , .Cm AuthorizedPrincipalsFile , .Cm Banner , .Cm ChrootDirectory , -- cgit v1.2.3