summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-12-07 03:32:26 +0000
committerDamien Miller <djm@mindrot.org>2018-12-27 14:30:17 +1100
commit737e4edd82406595815efadc28ed5161b8b0c01a (patch)
tree94bb5b1a1b23b12c14209f6c795d8b3fdb72689a
parent8a22ffaa13391cfe5b40316d938fe0fb931e9296 (diff)
upstream: mention that the ssh-keygen -F (find host in
authorized_keys) and -R (remove host from authorized_keys) options may accept either a bare hostname or a [hostname]:port combo. bz#2935 OpenBSD-Commit-ID: 5535cf4ce78375968b0d2cd7aa316fa3eb176780
-rw-r--r--ssh-keygen.112
1 files changed, 7 insertions, 5 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index bfa2eb5f3..db0a89aac 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.150 2018/09/12 06:18:59 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.151 2018/12/07 03:32:26 djm Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: September 12 2018 $ 38.Dd $Mdocdate: December 7 2018 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -289,9 +289,10 @@ The default export format is
289.Dq RFC4716 . 289.Dq RFC4716 .
290This option allows exporting OpenSSH keys for use by other programs, including 290This option allows exporting OpenSSH keys for use by other programs, including
291several commercial SSH implementations. 291several commercial SSH implementations.
292.It Fl F Ar hostname 292.It Fl F Ar hostname | [hostname]:port
293Search for the specified 293Search for the specified
294.Ar hostname 294.Ar hostname
295(with optional port number)
295in a 296in a
296.Pa known_hosts 297.Pa known_hosts
297file, listing any occurrences found. 298file, listing any occurrences found.
@@ -517,9 +518,10 @@ Test whether keys have been revoked in a KRL.
517.It Fl q 518.It Fl q
518Silence 519Silence
519.Nm ssh-keygen . 520.Nm ssh-keygen .
520.It Fl R Ar hostname 521.It Fl F Ar hostname | [hostname]:port
521Removes all keys belonging to 522Removes all keys belonging to the specified
522.Ar hostname 523.Ar hostname
524(with optional port number)
523from a 525from a
524.Pa known_hosts 526.Pa known_hosts
525file. 527file.