[openssh-commits] [openssh] 01/03: upstream commit

[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 30484e5e5f0b63d2c6ba32c6b85f06b6c6fa55fc
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Mon Sep 18 09:41:52 2017 +0000

    upstream commit
    
    Add braces missing after channels refactor.  ok markus@
    
    Upstream-ID: 72ab325c84e010680dbc88f226e2aa96b11a3980
---
 servconf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/servconf.c b/servconf.c
index e0e43c3d..16436512 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.310 2017/09/12 06:32:07 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.311 2017/09/18 09:41:52 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1665,11 +1665,12 @@ process_server_config_line(ServerOptions *options, char *line,
 			    filename, linenum);
 		i = options->num_permitted_opens;	/* modified later */
 		if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
-			if (*activep && i == 0)
+			if (*activep && i == 0) {
 				options->num_permitted_opens = 1;
 				options->permitted_opens = xcalloc(1,
 				    sizeof(*options->permitted_opens));
 				options->permitted_opens[0] = xstrdup(arg);
+			}
 			break;
 		}
 		for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) {

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