diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-09-18 09:41:52 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-09-19 14:26:43 +1000 |
commit | 30484e5e5f0b63d2c6ba32c6b85f06b6c6fa55fc (patch) | |
tree | 0422c32aa07550c4755da6f83925a3215b715451 /servconf.c | |
parent | b79569190b9b76dfacc6d996faa482f16e8fc026 (diff) |
upstream commit
Add braces missing after channels refactor. ok markus@
Upstream-ID: 72ab325c84e010680dbc88f226e2aa96b11a3980
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index e0e43c3dd..16436512e 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | /* $OpenBSD: servconf.c,v 1.310 2017/09/12 06:32:07 djm Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.311 2017/09/18 09:41:52 dtucker Exp $ */ |
3 | /* | 3 | /* |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | 5 | * All rights reserved |
@@ -1665,11 +1665,12 @@ process_server_config_line(ServerOptions *options, char *line, | |||
1665 | filename, linenum); | 1665 | filename, linenum); |
1666 | i = options->num_permitted_opens; /* modified later */ | 1666 | i = options->num_permitted_opens; /* modified later */ |
1667 | if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { | 1667 | if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { |
1668 | if (*activep && i == 0) | 1668 | if (*activep && i == 0) { |
1669 | options->num_permitted_opens = 1; | 1669 | options->num_permitted_opens = 1; |
1670 | options->permitted_opens = xcalloc(1, | 1670 | options->permitted_opens = xcalloc(1, |
1671 | sizeof(*options->permitted_opens)); | 1671 | sizeof(*options->permitted_opens)); |
1672 | options->permitted_opens[0] = xstrdup(arg); | 1672 | options->permitted_opens[0] = xstrdup(arg); |
1673 | } | ||
1673 | break; | 1674 | break; |
1674 | } | 1675 | } |
1675 | for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) { | 1676 | for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) { |