]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: r1.522 deleted one too many lines; repair
authordjm@openbsd.org <djm@openbsd.org>
Fri, 3 Apr 2020 06:07:57 +0000 (06:07 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 3 Apr 2020 06:09:42 +0000 (17:09 +1100)
OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477

ssh.c

diff --git a/ssh.c b/ssh.c
index e8bf9cb6a36e4f645016a1362e71b97f34ef9015..176085647b22f798701e2d4c4230978a3cda5fc5 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.525 2020/04/03 04:06:26 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.526 2020/04/03 06:07:57 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1543,6 +1543,7 @@ main(int ac, char **av)
        }
 
        if (options.forward_agent && options.forward_agent_sock_path != NULL) {
+               cp = options.forward_agent_sock_path;
                if (cp[0] == '$') {
                        if (!valid_env_name(cp + 1)) {
                                fatal("Invalid ForwardAgent environment variable name %s", cp);