diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-05-24 10:34:36 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-05-24 10:34:36 +1000 |
commit | 1973c8889875042977ded9774b4363509f4aa79a (patch) | |
tree | 4491790a9ada52702256e39d14c26801017b3c27 | |
parent | e7066dfde3d4ac36038050b6027a742356f7b1f1 (diff) |
- djm@cvs.openbsd.org 2004/05/22 06:32:12
[clientloop.c ssh.1]
use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | ssh.1 | 6 |
3 files changed, 9 insertions, 6 deletions
@@ -15,6 +15,9 @@ | |||
15 | bz #756: add support for the cancel-tcpip-forward request for the server and | 15 | bz #756: add support for the cancel-tcpip-forward request for the server and |
16 | the client (through the ~C commandline). reported by z3p AT twistedmatrix.com; | 16 | the client (through the ~C commandline). reported by z3p AT twistedmatrix.com; |
17 | ok markus@ | 17 | ok markus@ |
18 | - djm@cvs.openbsd.org 2004/05/22 06:32:12 | ||
19 | [clientloop.c ssh.1] | ||
20 | use '-h' for help in ~C commandline instead of '-?'; inspired by jmc@ | ||
18 | 21 | ||
19 | 20040523 | 22 | 20040523 |
20 | - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in | 23 | - (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in |
@@ -1144,4 +1147,4 @@ | |||
1144 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1147 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1145 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1148 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1146 | 1149 | ||
1147 | $Id: ChangeLog,v 1.3362 2004/05/24 00:18:05 dtucker Exp $ | 1150 | $Id: ChangeLog,v 1.3363 2004/05/24 00:34:36 dtucker Exp $ |
diff --git a/clientloop.c b/clientloop.c index ce627e8b8..31e604180 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.121 2004/05/21 11:33:11 djm Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.122 2004/05/22 06:32:12 djm Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -521,7 +521,7 @@ process_cmdline(void) | |||
521 | if (*s == '\0') | 521 | if (*s == '\0') |
522 | goto out; | 522 | goto out; |
523 | 523 | ||
524 | if (*s == '?') { | 524 | if (*s == 'h' || *s == 'H' || *s == '?') { |
525 | logit("Commands:"); | 525 | logit("Commands:"); |
526 | logit(" -Lport:host:hostport Request local forward"); | 526 | logit(" -Lport:host:hostport Request local forward"); |
527 | logit(" -Rport:host:hostport Request remote forward"); | 527 | logit(" -Rport:host:hostport Request remote forward"); |
@@ -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.186 2004/05/21 11:33:11 djm Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.187 2004/05/22 06:32:12 djm Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -311,8 +311,8 @@ options (see below). | |||
311 | It also allows the cancellation of existing remote port-forwardings | 311 | It also allows the cancellation of existing remote port-forwardings |
312 | using | 312 | using |
313 | .Fl KR Ar hostport . | 313 | .Fl KR Ar hostport . |
314 | Basic help is available, using the | 314 | Basic help is available, using the |
315 | .Fl ? | 315 | .Fl h |
316 | option. | 316 | option. |
317 | .It Cm ~R | 317 | .It Cm ~R |
318 | Request rekeying of the connection | 318 | Request rekeying of the connection |