1 files changed, 13 insertions, 10 deletions

diff --git a/sftp.c b/sftp.c
index ff14d3c29..2799e4a10 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.197 2020/01/23 07:10:22 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.200 2020/04/03 05:53:52 jmc Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -2363,7 +2363,7 @@ usage(void)
         extern char *__progname;
 
         fprintf(stderr,
-            "usage: %s [-46aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
+            "usage: %s [-46aCfNpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
             "          [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n"
             "          [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
             "          [-R num_requests] [-S program] [-s subsystem | sftp_server]\n"
@@ -2375,9 +2375,9 @@ usage(void)
 int
 main(int argc, char **argv)
 {
-        int in, out, ch, err, tmp, port = -1;
+        int in, out, ch, err, tmp, port = -1, noisy = 0;
         char *host = NULL, *user, *cp, *file2 = NULL;
-        int debug_level = 0, sshver = 2;
+        int debug_level = 0;
         char *file1 = NULL, *sftp_server = NULL;
         char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;
         const char *errstr;
@@ -2409,7 +2409,7 @@ main(int argc, char **argv)
         infile = stdin;
 
         while ((ch = getopt(argc, argv,
-            "1246afhpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
+            "1246afhNpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
                 switch (ch) {
                 /* Passed through to ssh(1) */
                 case '4':
@@ -2445,12 +2445,10 @@ main(int argc, char **argv)
                         debug_level++;
                         break;
                 case '1':
-                        sshver = 1;
-                        if (sftp_server == NULL)
-                                sftp_server = _PATH_SFTP_SERVER;
+                        fatal("SSH protocol v.1 is no longer supported");
                         break;
                 case '2':
-                        sshver = 2;
+                        /* accept silently */
                         break;
                 case 'a':
                         global_aflag = 1;
@@ -2475,6 +2473,9 @@ main(int argc, char **argv)
                 case 'f':
                         global_fflag = 1;
                         break;
+                case 'N':
+                        noisy = 1; /* Used to clear quiet mode after getopt */
+                        break;
                 case 'p':
                         global_pflag = 1;
                         break;
@@ -2513,6 +2514,9 @@ main(int argc, char **argv)
         if (!isatty(STDERR_FILENO))
                 showprogress = 0;
 
+        if (noisy)
+                quiet = 0;
+
         log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
 
         if (sftp_direct == NULL) {
@@ -2555,7 +2559,6 @@ main(int argc, char **argv)
                         addargs(&args, "-l");
                         addargs(&args, "%s", user);
                 }
-                addargs(&args, "-oProtocol %d", sshver);
 
                 /* no subsystem if the server-spec contains a '/' */
                 if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)