Attachment #2382 for bug #2161

Lines 1732-1739 copy_set_server_options(ServerOptions *d Link Here

(-)servconf.c (-2 lines)
1732	M_CP_INTOPT(hostbased_uses_name_from_packet_only);	1732	M_CP_INTOPT(hostbased_uses_name_from_packet_only);
1733	M_CP_INTOPT(kbd_interactive_authentication);	1733	M_CP_INTOPT(kbd_interactive_authentication);
1734	M_CP_INTOPT(zero_knowledge_password_authentication);	1734	M_CP_INTOPT(zero_knowledge_password_authentication);
1735	M_CP_STROPT(authorized_keys_command);
1736	M_CP_STROPT(authorized_keys_command_user);
1737	M_CP_INTOPT(permit_root_login);	1735	M_CP_INTOPT(permit_root_login);
1738	M_CP_INTOPT(permit_empty_passwd);	1736	M_CP_INTOPT(permit_empty_passwd);
1739		1737

Lines 200-205 struct connection_info { Link Here

(-)servconf.h (+3 lines)
200	* Match sub-config and the main config, and must be sent from the	200	* Match sub-config and the main config, and must be sent from the
201	* privsep slave to the privsep master. We use a macro to ensure all	201	* privsep slave to the privsep master. We use a macro to ensure all
202	* the options are copied and the copies are done in the correct order.	202	* the options are copied and the copies are done in the correct order.
		203	*
		204	* NB. an option must appear in servconf.c:copy_set_server_options() or
		205	* COPY_MATCH_STRING_OPTS here but never both.
203	*/	206	*/
204	#define COPY_MATCH_STRING_OPTS() do { \	207	#define COPY_MATCH_STRING_OPTS() do { \
205	M_CP_STROPT(banner); \	208	M_CP_STROPT(banner); \

Return to bug 2161