From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 3 Apr 2020 06:07:57 +0000 (+0000)
Subject: upstream: r1.522 deleted one too many lines; repair
X-Git-Tag: V_8_3_P1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81624026989654955a657ebf2a1fe8b9994f3c87;p=thirdparty%2Fopenssh-portable.git

upstream: r1.522 deleted one too many lines; repair

OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477
---

diff --git a/ssh.c b/ssh.c
index e8bf9cb6a..176085647 100644
--- 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);