View | Details | Raw Unified | Return to bug 1764 | Differences between
and this patch

Collapse All | Expand All

(-)servconf.c (-5 / +10 lines)
Lines 313-319 static struct { Link Here
313
	{ "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },
313
	{ "rhostsauthentication", sDeprecated, SSHCFG_GLOBAL },
314
	{ "rhostsrsaauthentication", sRhostsRSAAuthentication, SSHCFG_ALL },
314
	{ "rhostsrsaauthentication", sRhostsRSAAuthentication, SSHCFG_ALL },
315
	{ "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
315
	{ "hostbasedauthentication", sHostbasedAuthentication, SSHCFG_ALL },
316
	{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_GLOBAL },
316
	{ "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly, SSHCFG_ALL },
317
	{ "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
317
	{ "rsaauthentication", sRSAAuthentication, SSHCFG_ALL },
318
	{ "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
318
	{ "pubkeyauthentication", sPubkeyAuthentication, SSHCFG_ALL },
319
	{ "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
319
	{ "dsaauthentication", sPubkeyAuthentication, SSHCFG_GLOBAL }, /* alias */
Lines 384-394 static struct { Link Here
384
	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
384
	{ "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL },
385
	{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },
385
	{ "clientaliveinterval", sClientAliveInterval, SSHCFG_GLOBAL },
386
	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
386
	{ "clientalivecountmax", sClientAliveCountMax, SSHCFG_GLOBAL },
387
	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_GLOBAL },
387
	{ "authorizedkeysfile", sAuthorizedKeysFile, SSHCFG_ALL },
388
	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_GLOBAL },
388
	{ "authorizedkeysfile2", sAuthorizedKeysFile2, SSHCFG_ALL },
389
	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
389
	{ "useprivilegeseparation", sUsePrivilegeSeparation, SSHCFG_GLOBAL},
390
	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
390
	{ "acceptenv", sAcceptEnv, SSHCFG_GLOBAL },
391
	{ "permittunnel", sPermitTunnel, SSHCFG_GLOBAL },
391
	{ "permittunnel", sPermitTunnel, SSHCFG_ALL },
392
	{ "match", sMatch, SSHCFG_ALL },
392
	{ "match", sMatch, SSHCFG_ALL },
393
	{ "permitopen", sPermitOpen, SSHCFG_ALL },
393
	{ "permitopen", sPermitOpen, SSHCFG_ALL },
394
	{ "forcecommand", sForceCommand, SSHCFG_ALL },
394
	{ "forcecommand", sForceCommand, SSHCFG_ALL },
Lines 396-402 static struct { Link Here
396
	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
396
	{ "hostcertificate", sHostCertificate, SSHCFG_GLOBAL },
397
	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
397
	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
398
	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
398
	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
399
	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_GLOBAL },
399
	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
400
	{ NULL, sBadOption, 0 }
400
	{ NULL, sBadOption, 0 }
401
};
401
};
402
402
Lines 1403-1408 copy_set_server_options(ServerOptions *d Link Here
1403
	M_CP_INTOPT(pubkey_authentication);
1403
	M_CP_INTOPT(pubkey_authentication);
1404
	M_CP_INTOPT(kerberos_authentication);
1404
	M_CP_INTOPT(kerberos_authentication);
1405
	M_CP_INTOPT(hostbased_authentication);
1405
	M_CP_INTOPT(hostbased_authentication);
1406
	M_CP_INTOPT(hostbased_uses_name_from_packet_only);
1406
	M_CP_INTOPT(kbd_interactive_authentication);
1407
	M_CP_INTOPT(kbd_interactive_authentication);
1407
	M_CP_INTOPT(zero_knowledge_password_authentication);
1408
	M_CP_INTOPT(zero_knowledge_password_authentication);
1408
	M_CP_INTOPT(permit_root_login);
1409
	M_CP_INTOPT(permit_root_login);
Lines 1410-1415 copy_set_server_options(ServerOptions *d Link Here
1410
1411
1411
	M_CP_INTOPT(allow_tcp_forwarding);
1412
	M_CP_INTOPT(allow_tcp_forwarding);
1412
	M_CP_INTOPT(allow_agent_forwarding);
1413
	M_CP_INTOPT(allow_agent_forwarding);
1414
	M_CP_INTOPT(permit_tun);
1413
	M_CP_INTOPT(gateway_ports);
1415
	M_CP_INTOPT(gateway_ports);
1414
	M_CP_INTOPT(x11_display_offset);
1416
	M_CP_INTOPT(x11_display_offset);
1415
	M_CP_INTOPT(x11_forwarding);
1417
	M_CP_INTOPT(x11_forwarding);
Lines 1424-1429 copy_set_server_options(ServerOptions *d Link Here
1424
	M_CP_STROPT(chroot_directory);
1426
	M_CP_STROPT(chroot_directory);
1425
	M_CP_STROPT(trusted_user_ca_keys);
1427
	M_CP_STROPT(trusted_user_ca_keys);
1426
	M_CP_STROPT(revoked_keys_file);
1428
	M_CP_STROPT(revoked_keys_file);
1429
	M_CP_STROPT(authorized_keys_file);
1430
	M_CP_STROPT(authorized_keys_file2);
1431
	M_CP_STROPT(authorized_principals_file);
1427
}
1432
}
1428
1433
1429
#undef M_CP_INTOPT
1434
#undef M_CP_INTOPT

Return to bug 1764