summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-26 00:07:02 +1100
committerDamien Miller <djm@mindrot.org>2006-03-26 00:07:02 +1100
commita1b3d636abea0e2e75d797af22e93f01c424d80a (patch)
treebe3e0109a6e2591c1782873570c5f72a8cf4b4c2
parent5996294a954e3013ade0719f3c0c7389d3d333f7 (diff)
- jakob@cvs.openbsd.org 2006/03/22 21:16:24
[ssh.1] simplify SSHFP example; ok jmc@
-rw-r--r--ChangeLog5
-rw-r--r--ssh.15
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f7dceae92..b3298fe0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,9 @@
53 - deraadt@cvs.openbsd.org 2006/03/20 18:41:43 53 - deraadt@cvs.openbsd.org 2006/03/20 18:41:43
54 [dns.c] 54 [dns.c]
55 cast xstrdup to propert u_char * 55 cast xstrdup to propert u_char *
56 - jakob@cvs.openbsd.org 2006/03/22 21:16:24
57 [ssh.1]
58 simplify SSHFP example; ok jmc@
56 59
5720060318 6020060318
58 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via 61 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
@@ -4245,4 +4248,4 @@
4245 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4248 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4246 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4249 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4247 4250
4248$Id: ChangeLog,v 1.4239 2006/03/25 13:06:48 djm Exp $ 4251$Id: ChangeLog,v 1.4240 2006/03/25 13:07:02 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 139b00154..dab09c84e 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.258 2006/03/16 04:24:42 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.259 2006/03/22 21:16:24 jakob Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1025,8 +1025,7 @@ In this example, we are connecting a client to a server,
1025The SSHFP resource records should first be added to the zonefile for 1025The SSHFP resource records should first be added to the zonefile for
1026host.example.com: 1026host.example.com:
1027.Bd -literal -offset indent 1027.Bd -literal -offset indent
1028$ ssh-keygen -f /etc/ssh/ssh_host_rsa_key.pub -r host.example.com. 1028$ ssh-keygen -r host.example.com.
1029$ ssh-keygen -f /etc/ssh/ssh_host_dsa_key.pub -r host.example.com.
1030.Ed 1029.Ed
1031.Pp 1030.Pp
1032The output lines will have to be added to the zonefile. 1031The output lines will have to be added to the zonefile.