summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-04-03 06:07:57 +0000
committerDamien Miller <djm@mindrot.org>2020-04-03 17:09:42 +1100
commit81624026989654955a657ebf2a1fe8b9994f3c87 (patch)
tree4db0d19796a4948d59ec59136681ae16b48835e2
parent668cb3585ce829bd6e34d4a962c489bda1d16370 (diff)
upstream: r1.522 deleted one too many lines; repair
OpenBSD-Commit-ID: 1af8851fd7a99e4a887b19aa8f4c41a6b3d25477
-rw-r--r--ssh.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh.c b/ssh.c
index e8bf9cb6a..176085647 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.525 2020/04/03 04:06:26 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.526 2020/04/03 06:07:57 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1543,6 +1543,7 @@ main(int ac, char **av)
1543 } 1543 }
1544 1544
1545 if (options.forward_agent && options.forward_agent_sock_path != NULL) { 1545 if (options.forward_agent && options.forward_agent_sock_path != NULL) {
1546 cp = options.forward_agent_sock_path;
1546 if (cp[0] == '$') { 1547 if (cp[0] == '$') {
1547 if (!valid_env_name(cp + 1)) { 1548 if (!valid_env_name(cp + 1)) {
1548 fatal("Invalid ForwardAgent environment variable name %s", cp); 1549 fatal("Invalid ForwardAgent environment variable name %s", cp);