[openssh-commits] [openssh] 01/02: upstream: fix regression in r1.356: for ssh_config options that

[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 1a6f6b08e62c78906a3032e8d9a83e721c84574e
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Jun 8 22:06:12 2021 +0000

    upstream: fix regression in r1.356: for ssh_config options that
    
    accepted multiple string arguments, ssh was only recording the first.
    Reported by Lucas via bugs@
    
    OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d
---
 readconf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/readconf.c b/readconf.c
index 842bbcd9..22e69cb3 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.356 2021/06/08 07:07:15 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.357 2021/06/08 22:06:12 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1243,6 +1243,7 @@ parse_string:
 		max_entries = SSH_MAX_HOSTS_FILES;
 parse_char_array:
 		i = 0;
+		value = *uintptr == 0; /* was array empty when we started? */
 		while ((arg = argv_next(&ac, &av)) != NULL) {
 			if (*arg == '\0') {
 				error("%s line %d: keyword %s empty argument",
@@ -1259,7 +1260,7 @@ parse_char_array:
 				}
 			}
 			i++;
-			if (*activep && *uintptr == 0) {
+			if (*activep && value) {
 				if ((*uintptr) >= max_entries) {
 					error("%s line %d: too many %s "
 					    "entries.", filename, linenum,

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