upstream: Allow forwarding a different agent socket to the path

specified by $SSH_AUTH_SOCK, by extending the existing ForwardAgent option to
accepting an explicit path or the name of an environment variable in addition
to yes/no.

Patch by Eric Chiang, manpage by me; ok markus@

OpenBSD-Commit-ID: 98f2ed80bf34ea54d8b2ddd19ac14ebbf40e9265

1 files changed, 37 insertions, 6 deletions

diff --git a/readconf.c b/readconf.c
index 282afede6..cb3ae6dc7 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.318 2019/12/20 02:42:42 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.319 2019/12/21 02:19:13 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -919,6 +919,34 @@ parse_time:
 
         case oForwardAgent:
                 intptr = &options->forward_agent;
+
+                arg = strdelim(&s);
+                if (!arg || *arg == '\0')
+                        fatal("%s line %d: missing argument.",
+                            filename, linenum);
+
+                value = -1;
+                multistate_ptr = multistate_flag;
+                for (i = 0; multistate_ptr[i].key != NULL; i++) {
+                        if (strcasecmp(arg, multistate_ptr[i].key) == 0) {
+                                value = multistate_ptr[i].value;
+                                break;
+                        }
+                }
+                if (value != -1) {
+                        if (*activep && *intptr == -1)
+                                *intptr = value;
+                        break;
+                }
+                /* ForwardAgent wasn't 'yes' or 'no', assume a path */
+                if (*activep && *intptr == -1)
+                        *intptr = 1;
+
+                charptr = &options->forward_agent_sock_path;
+                goto parse_agent_path;
+
+        case oForwardX11:
+                intptr = &options->forward_x11;
  parse_flag:
                 multistate_ptr = multistate_flag;
  parse_multistate:
@@ -940,10 +968,6 @@ parse_time:
                         *intptr = value;
                 break;
 
-        case oForwardX11:
-                intptr = &options->forward_x11;
-                goto parse_flag;
-
         case oForwardX11Trusted:
                 intptr = &options->forward_x11_trusted;
                 goto parse_flag;
@@ -1736,6 +1760,7 @@ parse_keytypes:
                 if (!arg || *arg == '\0')
                         fatal("%.200s line %d: Missing argument.",
                             filename, linenum);
+  parse_agent_path:
                 /* Extra validation if the string represents an env var. */
                 if (arg[0] == '$' && !valid_env_name(arg + 1)) {
                         fatal("%.200s line %d: Invalid environment name %s.",
@@ -1853,6 +1878,7 @@ initialize_options(Options * options)
 {
         memset(options, 'X', sizeof(*options));
         options->forward_agent = -1;
+        options->forward_agent_sock_path = NULL;
         options->forward_x11 = -1;
         options->forward_x11_trusted = -1;
         options->forward_x11_timeout = -1;
@@ -2636,7 +2662,6 @@ dump_client_config(Options *o, const char *host)
         dump_cfg_fmtint(oClearAllForwardings, o->clear_forwardings);
         dump_cfg_fmtint(oExitOnForwardFailure, o->exit_on_forward_failure);
         dump_cfg_fmtint(oFingerprintHash, o->fingerprint_hash);
-        dump_cfg_fmtint(oForwardAgent, o->forward_agent);
         dump_cfg_fmtint(oForwardX11, o->forward_x11);
         dump_cfg_fmtint(oForwardX11Trusted, o->forward_x11_trusted);
         dump_cfg_fmtint(oGatewayPorts, o->fwd_opts.gateway_ports);
@@ -2712,6 +2737,12 @@ dump_client_config(Options *o, const char *host)
 
         /* Special cases */
 
+        /* oForwardAgent */
+        if (o->forward_agent_sock_path == NULL)
+                dump_cfg_fmtint(oForwardAgent, o->forward_agent);
+        else
+                dump_cfg_string(oForwardAgent, o->forward_agent_sock_path);
+
         /* oConnectTimeout */
         if (o->connection_timeout == -1)
                 printf("connecttimeout none\n");