summaryrefslogtreecommitdiffstats
path: root/servconf.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-10-02 21:33:20 +0200
committerDamien Miller <djm@mindrot.org>2017-10-02 21:34:26 +0200
commit66bf74a92131b7effe49fb0eefe5225151869dc5 (patch)
tree71a79e03a25a2381339989d22baaa5862f877b7a /servconf.h
parentupdate URL again (diff)
downloadopenssh-66bf74a92131b7effe49fb0eefe5225151869dc5.tar.xz
openssh-66bf74a92131b7effe49fb0eefe5225151869dc5.zip
upstream commitV_7_6_P1
Fix PermitOpen crash; spotted by benno@, ok dtucker@ deraadt@ Upstream-ID: c2cc84ffac070d2e1ff76182c70ca230a387983c
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.h b/servconf.h
index ffcbc3319..1dca702e6 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.125 2017/09/12 06:32:07 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.126 2017/10/02 19:33:20 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -237,7 +237,7 @@ struct connection_info {
M_CP_STRARRAYOPT(deny_groups, num_deny_groups); \
M_CP_STRARRAYOPT(accept_env, num_accept_env); \
M_CP_STRARRAYOPT(auth_methods, num_auth_methods); \
- M_CP_STRARRAYOPT(permitted_opens, num_permitted_opens); \
+ M_CP_STRARRAYOPT_ALLOC(permitted_opens, num_permitted_opens); \
} while (0)
struct connection_info *get_connection_info(int, int);