diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2017-05-02 08:06:33 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:04 +1000 |
commit | 4f1ca823bad12e4f9614895eefe0d0073b84a28f (patch) | |
tree | b4ece75a8bf2f2ae3e84d5f7952cf098d8640f58 | |
parent | 6b84897f7fd39956b849eac7810319d8a9958568 (diff) |
upstream commit
remove options -12 from usage();
Upstream-ID: db7ceef25132e63b50ed05289bf447fece1d1270
-rw-r--r-- | scp.c | 4 | ||||
-rw-r--r-- | ssh.c | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.190 2017/04/30 23:28:12 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.191 2017/05/02 08:06:33 jmc Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -1274,7 +1274,7 @@ void usage(void) { (void) fprintf(stderr, - "usage: scp [-12346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n" + "usage: scp [-346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n" " [-l limit] [-o ssh_option] [-P port] [-S program]\n" " [[user@]host1:]file1 ... [[user@]host2:]file2\n"); exit(1); @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.458 2017/04/30 23:28:42 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.459 2017/05/02 08:06:33 jmc Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -197,7 +197,7 @@ static void usage(void) { fprintf(stderr, -"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" +"usage: ssh [-46AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" " [-F configfile] [-I pkcs11] [-i identity_file]\n" " [-J [user@]host[:port]] [-L address] [-l login_name] [-m mac_spec]\n" |