upstream commit

remove options -12 from usage();

Upstream-ID: db7ceef25132e63b50ed05289bf447fece1d1270

diff --git a/scp.c b/scp.c
index b8895a65d51578dd5434dc22a5da878c37780b60..f9f48e0759cffc50cc8e3149daeba45a72ef92e8 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -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);

diff --git a/ssh.c b/ssh.c
index 619c2c2a08375b43767c52582f9eddf112808a75..70631c24dade88b70d9f850d97fc122fd2184df4 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -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"