diff options
| author | Damien Miller <djm@mindrot.org> | 2013-12-05 14:07:27 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-12-05 14:07:27 +1100 |
| commit | 534b2ccadea5e5e9a8b27226e6faac3ed5552e97 (patch) | |
| tree | 4b54195987d588e0785c5add1b34c72e187ea83f /servconf.h | |
| parent | 8369c8e61a3408ec6bb75755fad4ffce29b5fdbe (diff) | |
| download | openssh-git-534b2ccadea5e5e9a8b27226e6faac3ed5552e97.tar.gz | |
- djm@cvs.openbsd.org 2013/12/05 01:16:41
[servconf.c servconf.h]
bz#2161 - fix AuthorizedKeysCommand inside a Match block and
rearrange things so the same error is harder to make next time;
with and ok dtucker@
Diffstat (limited to 'servconf.h')
| -rw-r--r-- | servconf.h | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.110 2013/10/29 09:48:02 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.111 2013/12/05 01:16:41 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -202,6 +202,9 @@ struct connection_info { * Match sub-config and the main config, and must be sent from the * privsep slave to the privsep master. We use a macro to ensure all * the options are copied and the copies are done in the correct order. + * + * NB. an option must appear in servconf.c:copy_set_server_options() or + * COPY_MATCH_STRING_OPTS here but never both. */ #define COPY_MATCH_STRING_OPTS() do { \ M_CP_STROPT(banner); \ |