summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2015-09-11 06:55:46 +0000
committerDamien Miller <djm@mindrot.org>2015-09-16 17:52:06 +1000
commit846f6fa4cfa8483a9195971dbdd162220f199d85 (patch)
tree28ab44aef20c165ee740cf221ec39ab8dc1b239d /ssh.c
parent95923e0520a8647417ee6dcdff44694703dfeef0 (diff)
upstream commit
sync -Q in usage() to SYNOPSIS; since it's drastically shorter, i've reformatted the block to sync with the man (80 cols) and saved a line; Upstream-ID: 86e2c65c3989a0777a6258a77e589b9f6f354abd
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/ssh.c b/ssh.c
index 913c139ef..91911d3d5 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.424 2015/09/11 05:27:02 dtucker Exp $ */ 1/* $OpenBSD: ssh.c,v 1.425 2015/09/11 06:55:46 jmc 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
@@ -203,11 +203,9 @@ usage(void)
203 fprintf(stderr, 203 fprintf(stderr,
204"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" 204"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
205" [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" 205" [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
206" [-F configfile] [-I pkcs11] [-i identity_file]\n" 206" [-F configfile] [-I pkcs11] [-i identity_file] [-L address]\n"
207" [-L address] [-l login_name] [-m mac_spec]\n" 207" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
208" [-O ctl_cmd] [-o option] [-p port]\n" 208" [-Q query_option] [-R address] [-S ctl_path] [-W host:port]\n"
209" [-Q cipher | cipher-auth | mac | kex | key | protocol-version]\n"
210" [-R address] [-S ctl_path] [-W host:port]\n"
211" [-w local_tun[:remote_tun]] [user@]hostname [command]\n" 209" [-w local_tun[:remote_tun]] [user@]hostname [command]\n"
212 ); 210 );
213 exit(255); 211 exit(255);