Attachment 1863 Details for Bug 1764 – /home/djm/more-match.diff

[patch] /home/djm/more-match.diff

more-match.diff (text/plain), 2.97 KB, created by Damien Miller on 2010-06-18 10:38:03 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2010-06-18 10:38:03 AEST

Size: 2.97 KB

patch

obsolete

>Index: servconf.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/servconf.c,v
>retrieving revision 1.208
>diff -u -p -r1.208 servconf.c
>--- servconf.c	7 May 2010 11:30:29 -0000	1.208
>+++ servconf.c	18 Jun 2010 00:35:57 -0000
>@@ -313,7 +313,7 @@ static struct {
> 	{ "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },
> 	{ "rhostsrsaauthentication", sRhostsRSAAuthentication, SSHCFG_ALL },
> 	{ "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
>-	{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL },
>+	{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },
> 	{ "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
> 	{ "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
> 	{ "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
>@@ -384,11 +384,11 @@ static struct {
> 	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
> 	{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },
> 	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
>-	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
>-	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
>+	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
>+	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
> 	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
> 	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
>-	{ "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
>+	{ "permittunnel", sPermitTunnel, SSHCFG_ALL },
> 	{ "match", sMatch, SSHCFG_ALL },
> 	{ "permitopen", sPermitOpen, SSHCFG_ALL },
> 	{ "forcecommand", sForceCommand, SSHCFG_ALL },
>@@ -396,7 +396,7 @@ static struct {
> 	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
> 	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
> 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
>-	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_GLOBAL },
>+	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
> 	{ NULL, sBadOption, 0 }
> };
> 
>@@ -1403,6 +1403,7 @@ copy_set_server_options(ServerOptions *d
> 	M_CP_INTOPT(pubkey_authentication);
> 	M_CP_INTOPT(kerberos_authentication);
> 	M_CP_INTOPT(hostbased_authentication);
>+	M_CP_INTOPT(hostbased_uses_name_from_packet_only);
> 	M_CP_INTOPT(kbd_interactive_authentication);
> 	M_CP_INTOPT(zero_knowledge_password_authentication);
> 	M_CP_INTOPT(permit_root_login);
>@@ -1410,6 +1411,7 @@ copy_set_server_options(ServerOptions *d
> 
> 	M_CP_INTOPT(allow_tcp_forwarding);
> 	M_CP_INTOPT(allow_agent_forwarding);
>+	M_CP_INTOPT(permit_tun);
> 	M_CP_INTOPT(gateway_ports);
> 	M_CP_INTOPT(x11_display_offset);
> 	M_CP_INTOPT(x11_forwarding);
>@@ -1424,6 +1426,9 @@ copy_set_server_options(ServerOptions *d
> 	M_CP_STROPT(chroot_directory);
> 	M_CP_STROPT(trusted_user_ca_keys);
> 	M_CP_STROPT(revoked_keys_file);
>+	M_CP_STROPT(authorized_keys_file);
>+	M_CP_STROPT(authorized_keys_file2);
>+	M_CP_STROPT(authorized_principals_file);
> }
> 
> #undef M_CP_INTOPT

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1764: 1862 | 1863 | 1876