Attachment 2382 Details for Bug 2161 – Fix AuthorizedKeysCommand in Match block

[patch] Fix AuthorizedKeysCommand in Match block

bz2161.diff (text/plain), 1.35 KB, created by Damien Miller on 2013-12-05 11:52:22 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2013-12-05 11:52:22 AEDT

Size: 1.35 KB

patch

obsolete

>Index: servconf.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/servconf.c,v
>retrieving revision 1.246
>diff -u -p -r1.246 servconf.c
>--- servconf.c	21 Nov 2013 00:45:44 -0000	1.246
>+++ servconf.c	5 Dec 2013 00:51:27 -0000
>@@ -1732,8 +1732,6 @@ copy_set_server_options(ServerOptions *d
> 	M_CP_INTOPT(hostbased_uses_name_from_packet_only);
> 	M_CP_INTOPT(kbd_interactive_authentication);
> 	M_CP_INTOPT(zero_knowledge_password_authentication);
>-	M_CP_STROPT(authorized_keys_command);
>-	M_CP_STROPT(authorized_keys_command_user);
> 	M_CP_INTOPT(permit_root_login);
> 	M_CP_INTOPT(permit_empty_passwd);
> 
>Index: servconf.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/servconf.h,v
>retrieving revision 1.110
>diff -u -p -r1.110 servconf.h
>--- servconf.h	29 Oct 2013 09:48:02 -0000	1.110
>+++ servconf.h	5 Dec 2013 00:51:27 -0000
>@@ -200,6 +200,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); \

Actions: View | Diff

Attachments on bug 2161: 2382 | 2383