src/usr.bin/ssh/servconf.c - diff

Return to servconf.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/servconf.c between version 1.208 and 1.209

version 1.208, 2010/05/07 11:30:29

version 1.209, 2010/06/22 04:22:59

Line 313

{ "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 */

Line 384

{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },

{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },

{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },

{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },

{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },

{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },

{ "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 },

Line 396

{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },

{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },

{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },

{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_GLOBAL },

{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },

{ NULL, sBadOption, 0 }

};

Line 1403

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

Line 1410

Line 1411

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

Line 1424

Line 1426

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