diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-01-06 02:34:54 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-01-30 11:05:18 +1100 |
| commit | 0999533014784579aa6f01c2d3a06e3e8804b680 (patch) | |
| tree | ed69dd8d28a48dbc388918b72fc6fa050dea493e | |
| parent | 51045869fa084cdd016fdd721ea760417c0a3bf3 (diff) | |
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
| -rw-r--r-- | sshd_config.5 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 32b29d240..4705096b0 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.239 2016/11/30 03:00:05 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.240 2017/01/06 02:34:54 dtucker Exp $ |
| 37 | .Dd $Mdocdate: November 30 2016 $ | 37 | .Dd $Mdocdate: January 6 2017 $ |
| 38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -1644,7 +1644,7 @@ The username. | |||
| 1644 | .El | 1644 | .El |
| 1645 | .Pp | 1645 | .Pp |
| 1646 | .Cm AuthorizedKeysCommand | 1646 | .Cm AuthorizedKeysCommand |
| 1647 | accepts the tokens %%, %f, %h, %t, and %u. | 1647 | accepts the tokens %%, %f, %k, %h, %t, and %u. |
| 1648 | .Pp | 1648 | .Pp |
| 1649 | .Cm AuthorizedKeysFile | 1649 | .Cm AuthorizedKeysFile |
| 1650 | accepts the tokens %%, %h, and %u. | 1650 | accepts the tokens %%, %h, and %u. |