summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-07 10:54:31 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-07 10:54:31 +1100
commitb707a243822f28d07702ce4fc2c1d6cf305bc631 (patch)
tree4ffdd3e5d3e60b4b6fc456b49b5dfea6ea3e053a
parentc863895e0ab7f9430402736e953e62dae46be458 (diff)
- dtucker@cvs.openbsd.org 2009/10/06 23:51:49
[regress/ssh2putty.sh] Add OpenBSD tag to make syncs easier
-rw-r--r--ChangeLog8
-rwxr-xr-xregress/ssh2putty.sh1
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bcaae4fef..824bca846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,7 +101,8 @@
101 regression test for port number parsing. written as part of the a2port 101 regression test for port number parsing. written as part of the a2port
102 change that went into 5.2 but I forgot to commit it at the time... 102 change that went into 5.2 but I forgot to commit it at the time...
103 - djm@cvs.openbsd.org 2009/08/13 01:11:55 103 - djm@cvs.openbsd.org 2009/08/13 01:11:55
104 [sftp-batch.sh sftp-badcmds.sh sftp.sh sftp-cmds.sh sftp-glob.sh] 104 [regress/sftp-batch.sh regress/sftp-badcmds.sh regress/sftp.sh
105 regress/sftp-cmds.sh regres/sftp-glob.sh]
105 date: 2009/08/13 01:11:19; author: djm; state: Exp; lines: +10 -7 106 date: 2009/08/13 01:11:19; author: djm; state: Exp; lines: +10 -7
106 Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path", 107 Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path",
107 add "-P port" to match scp(1). Fortunately, the -P option is only really 108 add "-P port" to match scp(1). Fortunately, the -P option is only really
@@ -109,9 +110,12 @@
109 part of larger patch from carlosvsilvapt@gmail.com for his Google Summer 110 part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
110 of Code work; ok deraadt markus 111 of Code work; ok deraadt markus
111 - djm@cvs.openbsd.org 2009/08/20 18:43:07 112 - djm@cvs.openbsd.org 2009/08/20 18:43:07
112 [ssh-com-sftp.sh] 113 [regress/ssh-com-sftp.sh]
113 fix one sftp -D ... => sftp -P ... conversion that I missed; from Carlos 114 fix one sftp -D ... => sftp -P ... conversion that I missed; from Carlos
114 Silva for Google Summer of Code 115 Silva for Google Summer of Code
116 - dtucker@cvs.openbsd.org 2009/10/06 23:51:49
117 [regress/ssh2putty.sh]
118 Add OpenBSD tag to make syncs easier
115 119
11620091002 12020091002
117 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. 121 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh
index dfdeeff4a..5d9de1cd7 100755
--- a/regress/ssh2putty.sh
+++ b/regress/ssh2putty.sh
@@ -1,4 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2# $OpenBSD: ssh2putty.sh,v 1.1 2009/10/06 23:51:49 dtucker Exp $
2 3
3if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then 4if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then
4 echo "Usage: ssh2putty hostname port ssh-private-key" 5 echo "Usage: ssh2putty hostname port ssh-private-key"