Attachment 1876 Details for Bug 1764 – Also update the list of options that work with Match in sshd_config(5)

[patch] Also update the list of options that work with Match in sshd_config(5)

more-match.diff (text/plain), 3.67 KB, created by Iain Morgan on 2010-06-19 04:48:53 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Iain Morgan

Created: 2010-06-19 04:48:53 AEST

Size: 3.67 KB

patch

obsolete

>Index: servconf.c
>===================================================================
>RCS file: /cvs/openssh/servconf.c,v
>retrieving revision 1.203
>diff -u -r1.203 servconf.c
>--- servconf.c	10 May 2010 01:58:03 -0000	1.203
>+++ servconf.c	18 Jun 2010 18:17:44 -0000
>@@ -346,7 +346,7 @@
> 	{ "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 */
>@@ -421,11 +421,11 @@
> 	{ "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 },
>@@ -433,7 +433,7 @@
> 	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
> 	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
> 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
>-	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_GLOBAL },
>+	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
> 	{ NULL, sBadOption, 0 }
> };
> 
>@@ -1446,6 +1446,7 @@
> 	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);
>@@ -1453,6 +1454,7 @@
> 
> 	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);
>@@ -1467,6 +1469,9 @@
> 	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
>Index: sshd_config.5
>===================================================================
>RCS file: /cvs/openssh/sshd_config.5,v
>retrieving revision 1.129
>diff -u -r1.129 sshd_config.5
>--- sshd_config.5	10 May 2010 01:58:45 -0000	1.129
>+++ sshd_config.5	18 Jun 2010 18:17:44 -0000
>@@ -644,12 +644,15 @@
> Available keywords are
> .Cm AllowAgentForwarding ,
> .Cm AllowTcpForwarding ,
>+.Cm AuthorizedKeysFile ,
>+.Cm AuthorizedPrincipalsFile ,
> .Cm Banner ,
> .Cm ChrootDirectory ,
> .Cm ForceCommand ,
> .Cm GatewayPorts ,
> .Cm GSSAPIAuthentication ,
> .Cm HostbasedAuthentication ,
>+.Cm HostbasedUsesNameFromPacketOnly ,
> .Cm KbdInteractiveAuthentication ,
> .Cm KerberosAuthentication ,
> .Cm MaxAuthTries ,
>@@ -658,6 +661,7 @@
> .Cm PermitEmptyPasswords ,
> .Cm PermitOpen ,
> .Cm PermitRootLogin ,
>+.Cm PermitTunnel ,
> .Cm PubkeyAuthentication ,
> .Cm RhostsRSAAuthentication ,
> .Cm RSAAuthentication ,

Actions: View | Diff

Attachments on bug 1764: 1862 | 1863 | 1876