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

Return to clientloop.c CVS log

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

version 1.354, 2020/10/18 11:32:01

version 1.355, 2020/10/29 02:47:23

Line 1878

return 0;

}

/* Record if address matched against a different hostname. */

/* If CheckHostIP is enabled, then check for mismatched hostname/addr */

if (ctx->ip_str != NULL && (l->match & HKF_MATCH_HOST) == 0 &&

if (ctx->ip_str != NULL && strchr(l->hosts, ',') != NULL) {

strchr(l->hosts, ',') != NULL) {

if ((l->match & HKF_MATCH_HOST) == 0) {

ctx->other_name_seen = 1;

/* Record if address matched a different hostname. */

debug3_f("found address %s against different hostname at "

ctx->other_name_seen = 1;

"%s:%ld", ctx->ip_str, l->path, l->linenum);

debug3_f("found address %s against different hostname "

return 0;

"at %s:%ld", ctx->ip_str, l->path, l->linenum);

return 0;

} else if ((l->match & HKF_MATCH_IP) == 0) {

/* Record if hostname matched a different address. */

ctx->other_name_seen = 1;

debug3_f("found hostname %s against different address "

"at %s:%ld", ctx->host_str, l->path, l->linenum);

}

Line 2277

Line 2284

ctx->ip_str ? ctx->ip_str : "(none)");

if ((r = hostkeys_foreach(options.user_hostfiles[i],

hostkeys_find, ctx, ctx->host_str, ctx->ip_str,

HKF_WANT_PARSE_KEY|HKF_WANT_MATCH)) != 0) {

HKF_WANT_PARSE_KEY)) != 0) {

if (r == SSH_ERR_SYSTEM_ERROR && errno == ENOENT) {

debug_f("hostkeys file %s does not exist",

options.user_hostfiles[i]);