mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-24 10:53:24 +08:00
- 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@
This commit is contained in:
parent
e7066dfde3
commit
1973c88898
@ -15,6 +15,9 @@
|
|||||||
bz #756: add support for the cancel-tcpip-forward request for the server and
|
bz #756: add support for the cancel-tcpip-forward request for the server and
|
||||||
the client (through the ~C commandline). reported by z3p AT twistedmatrix.com;
|
the client (through the ~C commandline). reported by z3p AT twistedmatrix.com;
|
||||||
ok markus@
|
ok markus@
|
||||||
|
- 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@
|
||||||
|
|
||||||
20040523
|
20040523
|
||||||
- (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in
|
- (djm) [sshd_config] Explain consequences of UsePAM=yes a little better in
|
||||||
@ -1144,4 +1147,4 @@
|
|||||||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.3362 2004/05/24 00:18:05 dtucker Exp $
|
$Id: ChangeLog,v 1.3363 2004/05/24 00:34:36 dtucker Exp $
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: clientloop.c,v 1.121 2004/05/21 11:33:11 djm Exp $");
|
RCSID("$OpenBSD: clientloop.c,v 1.122 2004/05/22 06:32:12 djm Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
@ -521,7 +521,7 @@ process_cmdline(void)
|
|||||||
if (*s == '\0')
|
if (*s == '\0')
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (*s == '?') {
|
if (*s == 'h' || *s == 'H' || *s == '?') {
|
||||||
logit("Commands:");
|
logit("Commands:");
|
||||||
logit(" -Lport:host:hostport Request local forward");
|
logit(" -Lport:host:hostport Request local forward");
|
||||||
logit(" -Rport:host:hostport Request remote forward");
|
logit(" -Rport:host:hostport Request remote forward");
|
||||||
|
6
ssh.1
6
ssh.1
@ -34,7 +34,7 @@
|
|||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: ssh.1,v 1.186 2004/05/21 11:33:11 djm Exp $
|
.\" $OpenBSD: ssh.1,v 1.187 2004/05/22 06:32:12 djm Exp $
|
||||||
.Dd September 25, 1999
|
.Dd September 25, 1999
|
||||||
.Dt SSH 1
|
.Dt SSH 1
|
||||||
.Os
|
.Os
|
||||||
@ -311,8 +311,8 @@ options (see below).
|
|||||||
It also allows the cancellation of existing remote port-forwardings
|
It also allows the cancellation of existing remote port-forwardings
|
||||||
using
|
using
|
||||||
.Fl KR Ar hostport .
|
.Fl KR Ar hostport .
|
||||||
Basic help is available, using the
|
Basic help is available, using the
|
||||||
.Fl ?
|
.Fl h
|
||||||
option.
|
option.
|
||||||
.It Cm ~R
|
.It Cm ~R
|
||||||
Request rekeying of the connection
|
Request rekeying of the connection
|
||||||
|
Loading…
Reference in New Issue
Block a user