[openssh-commits] [openssh] 02/17: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 0999533014784579aa6f01c2d3a06e3e8804b680
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Jan 6 02:34:54 2017 +0000

    upstream commit
    
    Re-add '%k' token for AuthorizedKeysCommand which was
    lost during the re-org in rev 1.235.  bz#2656, from jboning at gmail.com.
    
    Upstream-ID: 2884e203c02764d7b3fe7472710d9c24bdc73e38
---
 sshd_config.5 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sshd_config.5 b/sshd_config.5
index 32b29d2..4705096 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.239 2016/11/30 03:00:05 djm Exp $
-.Dd $Mdocdate: November 30 2016 $
+.\" $OpenBSD: sshd_config.5,v 1.240 2017/01/06 02:34:54 dtucker Exp $
+.Dd $Mdocdate: January 6 2017 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1644,7 +1644,7 @@ The username.
 .El
 .Pp
 .Cm AuthorizedKeysCommand
-accepts the tokens %%, %f, %h, %t, and %u.
+accepts the tokens %%, %f, %k, %h, %t, and %u.
 .Pp
 .Cm AuthorizedKeysFile
 accepts the tokens %%, %h, and %u.

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.