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

Collapse All | Expand All

(-)monitor.c (+4 lines)
Lines 1015-1020 mm_answer_keyallowed(int sock, Buffer *m Link Here
1015
			allowed = options.pubkey_authentication &&
1015
			allowed = options.pubkey_authentication &&
1016
			    user_key_allowed(authctxt->pw, key);
1016
			    user_key_allowed(authctxt->pw, key);
1017
			auth_method = "publickey";
1017
			auth_method = "publickey";
1018
			if (options.pubkey_authentication && allowed != 1)
1019
				auth_clear_options();
1018
			break;
1020
			break;
1019
		case MM_HOSTKEY:
1021
		case MM_HOSTKEY:
1020
			allowed = options.hostbased_authentication &&
1022
			allowed = options.hostbased_authentication &&
Lines 1027-1032 mm_answer_keyallowed(int sock, Buffer *m Link Here
1027
			allowed = options.rhosts_rsa_authentication &&
1029
			allowed = options.rhosts_rsa_authentication &&
1028
			    auth_rhosts_rsa_key_allowed(authctxt->pw,
1030
			    auth_rhosts_rsa_key_allowed(authctxt->pw,
1029
			    cuser, chost, key);
1031
			    cuser, chost, key);
1032
			if (options.rhosts_rsa_authentication && allowed != 1)
1033
				auth_clear_options();
1030
			auth_method = "rsa";
1034
			auth_method = "rsa";
1031
			break;
1035
			break;
1032
		default:
1036
		default:

Return to bug 1472