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

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +8 lines)
Line  Link Here
0
-- openssh-7.4p1.orig/clientloop.c
0
++ openssh-7.4p1/clientloop.c
Lines 2498-2508 client_input_hostkeys(void) Link Here
2498
	    options.check_host_ip ? &ctx->ip_str : NULL);
2498
	    options.check_host_ip ? &ctx->ip_str : NULL);
2499
2499
2500
	/* Find which keys we already know about. */
2500
	/* Find which keys we already know about. */
2501
	if ((r = hostkeys_foreach(options.user_hostfiles[0], hostkeys_find,
2501
	for (i = 0; i < options.num_user_hostfiles; i++) {
2502
	    ctx, ctx->host_str, ctx->ip_str,
2502
		if ((r = hostkeys_foreach(options.user_hostfiles[i], hostkeys_find,
2503
	    HKF_WANT_PARSE_KEY|HKF_WANT_MATCH)) != 0) {
2503
		    ctx, ctx->host_str, ctx->ip_str,
2504
		error("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r));
2504
		    HKF_WANT_PARSE_KEY|HKF_WANT_MATCH)) != 0) {
2505
		goto out;
2505
			error("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r));
2506
			goto out;
2507
		}
2506
	}
2508
	}
2507
2509
2508
	/* Figure out if we have any new keys to add */
2510
	/* Figure out if we have any new keys to add */

Return to bug 2738