[openssh-commits] [openssh] 02/02: upstream: r1.522 deleted one too many lines; repair

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 81624026989654955a657ebf2a1fe8b9994f3c87
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Apr 3 06:07:57 2020 +0000

    upstream: r1.522 deleted one too many lines; repair
    
    OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477
---
 ssh.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ssh.c b/ssh.c
index e8bf9cb6..17608564 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.