diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-10-02 19:33:20 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-10-03 06:34:26 +1100 |
commit | 66bf74a92131b7effe49fb0eefe5225151869dc5 (patch) | |
tree | 71a79e03a25a2381339989d22baaa5862f877b7a /monitor.c | |
parent | d63b38160a59039708fd952adc75a0b3da141560 (diff) |
upstream commit
Fix PermitOpen crash; spotted by benno@, ok dtucker@ deraadt@
Upstream-ID: c2cc84ffac070d2e1ff76182c70ca230a387983c
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.173 2017/09/12 06:32:07 djm Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.174 2017/10/02 19:33:20 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -760,10 +760,12 @@ mm_answer_pwnamallow(int sock, Buffer *m) | |||
760 | for (i = 0; i < options.nx; i++) \ | 760 | for (i = 0; i < options.nx; i++) \ |
761 | buffer_put_cstring(m, options.x[i]); \ | 761 | buffer_put_cstring(m, options.x[i]); \ |
762 | } while (0) | 762 | } while (0) |
763 | #define M_CP_STRARRAYOPT_ALLOC(x, nx) M_CP_STRARRAYOPT(x, nx) | ||
763 | /* See comment in servconf.h */ | 764 | /* See comment in servconf.h */ |
764 | COPY_MATCH_STRING_OPTS(); | 765 | COPY_MATCH_STRING_OPTS(); |
765 | #undef M_CP_STROPT | 766 | #undef M_CP_STROPT |
766 | #undef M_CP_STRARRAYOPT | 767 | #undef M_CP_STRARRAYOPT |
768 | #undef M_CP_STRARRAYOPT_ALLOC | ||
767 | 769 | ||
768 | /* Create valid auth method lists */ | 770 | /* Create valid auth method lists */ |
769 | if (auth2_setup_methods_lists(authctxt) != 0) { | 771 | if (auth2_setup_methods_lists(authctxt) != 0) { |