1 files changed, 13 insertions, 7 deletions

diff --git a/scp.c b/scp.c
index b4492a062..6ae17061d 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.210 2020/05/06 20:57:38 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.212 2020/08/03 02:43:41 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -373,8 +373,11 @@ typedef struct {
 BUF *allocbuf(BUF *, int, int);
 void lostconn(int);
 int okname(char *);
-void run_err(const char *,...);
-int note_err(const char *,...);
+void run_err(const char *,...)
+    __attribute__((__format__ (printf, 1, 2)))
+    __attribute__((__nonnull__ (1)));
+int note_err(const char *,...)
+    __attribute__((__format__ (printf, 1, 2)));
 void verifydir(char *);
 
 struct passwd *pwd;
@@ -422,7 +425,6 @@ main(int argc, char **argv)
         args.list = remote_remote_args.list = NULL;
         addargs(&args, "%s", ssh_program);
         addargs(&args, "-x");
-        addargs(&args, "-oForwardAgent=no");
         addargs(&args, "-oPermitLocalCommand=no");
         addargs(&args, "-oClearAllForwardings=yes");
         addargs(&args, "-oRemoteCommand=none");
@@ -430,7 +432,7 @@ main(int argc, char **argv)
 
         fflag = Tflag = tflag = 0;
         while ((ch = getopt(argc, argv,
-            "dfl:prtTvBCc:i:P:q12346S:o:F:J:")) != -1) {
+            "12346ABCTdfpqrtvF:J:P:S:c:i:l:o:")) != -1) {
                 switch (ch) {
                 /* User-visible flags. */
                 case '1':
@@ -439,6 +441,7 @@ main(int argc, char **argv)
                 case '2':
                         /* Ignored */
                         break;
+                case 'A':
                 case '4':
                 case '6':
                 case 'C':
@@ -520,6 +523,9 @@ main(int argc, char **argv)
         argc -= optind;
         argv += optind;
 
+        /* Do this last because we want the user to be able to override it */
+        addargs(&args, "-oForwardAgent=no");
+
         if ((pwd = getpwuid(userid = getuid())) == NULL)
                 fatal("unknown user %u", (u_int) userid);
 
@@ -1520,7 +1526,7 @@ bad:			run_err("%s: %s", np, strerror(errno));
                                 }
                 }
                 if (close(ofd) == -1)
-                        note_err(np, "%s: close: %s", np, strerror(errno));
+                        note_err("%s: close: %s", np, strerror(errno));
                 (void) response();
                 if (showprogress)
                         stop_progress_meter();
@@ -1590,7 +1596,7 @@ void
 usage(void)
 {
         (void) fprintf(stderr,
-            "usage: scp [-346BCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
+            "usage: scp [-346ABCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
             "            [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
             "            [-S program] source ... target\n");
         exit(1);