diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-10-05 15:52:03 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-10-20 12:01:02 +1100 |
commit | dceabc7ad7ebc7769c8214a1647af64c9a1d92e5 (patch) | |
tree | 513eb2c60aafcc240cd9bc2027a4f919a2934978 /monitor.c | |
parent | 2b4f3ab050c2aaf6977604dd037041372615178d (diff) |
upstream commit
replace statically-sized arrays in ServerOptions with
dynamic ones managed by xrecallocarray, removing some arbitrary (though
large) limits and saving a bit of memory; "much nicer" markus@
Upstream-ID: 1732720b2f478fe929d6687ac7b0a97ff2efe9d2
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.174 2017/10/02 19:33:20 djm Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.175 2017/10/05 15:52:03 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,12 +760,10 @@ 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) | ||
764 | /* See comment in servconf.h */ | 763 | /* See comment in servconf.h */ |
765 | COPY_MATCH_STRING_OPTS(); | 764 | COPY_MATCH_STRING_OPTS(); |
766 | #undef M_CP_STROPT | 765 | #undef M_CP_STROPT |
767 | #undef M_CP_STRARRAYOPT | 766 | #undef M_CP_STRARRAYOPT |
768 | #undef M_CP_STRARRAYOPT_ALLOC | ||
769 | 767 | ||
770 | /* Create valid auth method lists */ | 768 | /* Create valid auth method lists */ |
771 | if (auth2_setup_methods_lists(authctxt) != 0) { | 769 | if (auth2_setup_methods_lists(authctxt) != 0) { |