upstream commit

Add braces missing after channels refactor.  ok markus@

Upstream-ID: 72ab325c84e010680dbc88f226e2aa96b11a3980
This commit is contained in:
dtucker@openbsd.org 2017-09-18 09:41:52 +00:00 committed by Damien Miller
parent b79569190b
commit 30484e5e5f

View File

@ -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@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1665,11 +1665,12 @@ process_server_config_line(ServerOptions *options, char *line,
filename, linenum); filename, linenum);
i = options->num_permitted_opens; /* modified later */ i = options->num_permitted_opens; /* modified later */
if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
if (*activep && i == 0) if (*activep && i == 0) {
options->num_permitted_opens = 1; options->num_permitted_opens = 1;
options->permitted_opens = xcalloc(1, options->permitted_opens = xcalloc(1,
sizeof(*options->permitted_opens)); sizeof(*options->permitted_opens));
options->permitted_opens[0] = xstrdup(arg); options->permitted_opens[0] = xstrdup(arg);
}
break; break;
} }
for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) { for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) {