Attachment #1876 for bug #1764




	{ "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },
	{ "rhostsrsaauthentication", sRhostsRSAAuthentication, SSHCFG_ALL },
	{ "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
	{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },
	{ "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
	{ "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
	{ "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */

	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
	{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },
	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
	{ "permittunnel", sPermitTunnel, SSHCFG_ALL },
	{ "match", sMatch, SSHCFG_ALL },
	{ "permitopen", sPermitOpen, SSHCFG_ALL },
	{ "forcecommand", sForceCommand, SSHCFG_ALL },

	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
	{ NULL, sBadOption, 0 }
};


	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);


	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);

	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

Lines 644-655 Link Here

(-)sshd_config.5 (+4 lines)
644	Available keywords are	644	Available keywords are
645	.Cm AllowAgentForwarding ,	645	.Cm AllowAgentForwarding ,
646	.Cm AllowTcpForwarding ,	646	.Cm AllowTcpForwarding ,
		647	.Cm AuthorizedKeysFile ,
		648	.Cm AuthorizedPrincipalsFile ,
647	.Cm Banner ,	649	.Cm Banner ,
648	.Cm ChrootDirectory ,	650	.Cm ChrootDirectory ,
649	.Cm ForceCommand ,	651	.Cm ForceCommand ,
650	.Cm GatewayPorts ,	652	.Cm GatewayPorts ,
651	.Cm GSSAPIAuthentication ,	653	.Cm GSSAPIAuthentication ,
652	.Cm HostbasedAuthentication ,	654	.Cm HostbasedAuthentication ,
		655	.Cm HostbasedUsesNameFromPacketOnly ,
653	.Cm KbdInteractiveAuthentication ,	656	.Cm KbdInteractiveAuthentication ,
654	.Cm KerberosAuthentication ,	657	.Cm KerberosAuthentication ,
655	.Cm MaxAuthTries ,	658	.Cm MaxAuthTries ,
Lines 658-663 Link Here
658	.Cm PermitEmptyPasswords ,	661	.Cm PermitEmptyPasswords ,
659	.Cm PermitOpen ,	662	.Cm PermitOpen ,
660	.Cm PermitRootLogin ,	663	.Cm PermitRootLogin ,
		664	.Cm PermitTunnel ,
661	.Cm PubkeyAuthentication ,	665	.Cm PubkeyAuthentication ,
662	.Cm RhostsRSAAuthentication ,	666	.Cm RhostsRSAAuthentication ,
663	.Cm RSAAuthentication ,	667	.Cm RSAAuthentication ,

Return to bug 1764

Lines 346-352 Link Here

(-)servconf.c (-5 / +10 lines)
346	{ "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },	346	{ "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },
347	{ "rhostsrsaauthentication", sRhostsRSAAuthentication, SSHCFG_ALL },	347	{ "rhostsrsaauthentication", sRhostsRSAAuthentication, SSHCFG_ALL },
348	{ "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },	348	{ "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
349	{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL },	349	{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },
350	{ "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },	350	{ "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
351	{ "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },	351	{ "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
352	{ "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */	352	{ "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
Lines 421-431 Link Here
421	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },	421	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
422	{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },	422	{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },
423	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },	423	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
424	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },	424	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
425	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },	425	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
426	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},	426	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
427	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },	427	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
428	{ "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },	428	{ "permittunnel", sPermitTunnel, SSHCFG_ALL },
429	{ "match", sMatch, SSHCFG_ALL },	429	{ "match", sMatch, SSHCFG_ALL },
430	{ "permitopen", sPermitOpen, SSHCFG_ALL },	430	{ "permitopen", sPermitOpen, SSHCFG_ALL },
431	{ "forcecommand", sForceCommand, SSHCFG_ALL },	431	{ "forcecommand", sForceCommand, SSHCFG_ALL },
Lines 433-439 Link Here
433	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },	433	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
434	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },	434	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
435	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },	435	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
436	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_GLOBAL },	436	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
437	{ NULL, sBadOption, 0 }	437	{ NULL, sBadOption, 0 }
438	};	438	};
439		439
Lines 1446-1451 Link Here
1446	M_CP_INTOPT(pubkey_authentication);	1446	M_CP_INTOPT(pubkey_authentication);
1447	M_CP_INTOPT(kerberos_authentication);	1447	M_CP_INTOPT(kerberos_authentication);
1448	M_CP_INTOPT(hostbased_authentication);	1448	M_CP_INTOPT(hostbased_authentication);
		1449	M_CP_INTOPT(hostbased_uses_name_from_packet_only);
1449	M_CP_INTOPT(kbd_interactive_authentication);	1450	M_CP_INTOPT(kbd_interactive_authentication);
1450	M_CP_INTOPT(zero_knowledge_password_authentication);	1451	M_CP_INTOPT(zero_knowledge_password_authentication);
1451	M_CP_INTOPT(permit_root_login);	1452	M_CP_INTOPT(permit_root_login);
Lines 1453-1458 Link Here
1453		1454
1454	M_CP_INTOPT(allow_tcp_forwarding);	1455	M_CP_INTOPT(allow_tcp_forwarding);
1455	M_CP_INTOPT(allow_agent_forwarding);	1456	M_CP_INTOPT(allow_agent_forwarding);
		1457	M_CP_INTOPT(permit_tun);
1456	M_CP_INTOPT(gateway_ports);	1458	M_CP_INTOPT(gateway_ports);
1457	M_CP_INTOPT(x11_display_offset);	1459	M_CP_INTOPT(x11_display_offset);
1458	M_CP_INTOPT(x11_forwarding);	1460	M_CP_INTOPT(x11_forwarding);
Lines 1467-1472 Link Here
1467	M_CP_STROPT(chroot_directory);	1469	M_CP_STROPT(chroot_directory);
1468	M_CP_STROPT(trusted_user_ca_keys);	1470	M_CP_STROPT(trusted_user_ca_keys);
1469	M_CP_STROPT(revoked_keys_file);	1471	M_CP_STROPT(revoked_keys_file);
		1472	M_CP_STROPT(authorized_keys_file);
		1473	M_CP_STROPT(authorized_keys_file2);
		1474	M_CP_STROPT(authorized_principals_file);
1470	}	1475	}
1471		1476
1472	#undef M_CP_INTOPT	1477	#undef M_CP_INTOPT