diff options
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index 2d4b6ecb4..8812c5aab 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.110 2013/10/29 09:48:02 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.111 2013/12/05 01:16:41 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -202,6 +202,9 @@ struct connection_info { | |||
202 | * Match sub-config and the main config, and must be sent from the | 202 | * Match sub-config and the main config, and must be sent from the |
203 | * privsep slave to the privsep master. We use a macro to ensure all | 203 | * privsep slave to the privsep master. We use a macro to ensure all |
204 | * the options are copied and the copies are done in the correct order. | 204 | * the options are copied and the copies are done in the correct order. |
205 | * | ||
206 | * NB. an option must appear in servconf.c:copy_set_server_options() or | ||
207 | * COPY_MATCH_STRING_OPTS here but never both. | ||
205 | */ | 208 | */ |
206 | #define COPY_MATCH_STRING_OPTS() do { \ | 209 | #define COPY_MATCH_STRING_OPTS() do { \ |
207 | M_CP_STROPT(banner); \ | 210 | M_CP_STROPT(banner); \ |