diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-02-02 10:45:34 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-02-02 11:18:07 +0100 |
| commit | adffbe1c645ad2887ba0b6d24c194aa7a40c5735 (patch) | |
| tree | 3201fd657034d21d56e338cdf59b0b83aac7dd23 /clientloop.c | |
| parent | upstream: Prevent possible null pointer deref of ip_str in debug. (diff) | |
| download | openssh-adffbe1c645ad2887ba0b6d24c194aa7a40c5735.tar.xz openssh-adffbe1c645ad2887ba0b6d24c194aa7a40c5735.zip | |
upstream: Output (none) in debug in the case in the CheckHostIP=no case
as suggested by markus@
OpenBSD-Commit-ID: 4ab9117ee5261cbbd1868717fcc3142eea6385cf
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index c5b7f19cd..ebd0dbca1 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.339 2020/02/02 09:22:22 dtucker Exp $ */ +/* $OpenBSD: clientloop.c,v 1.340 2020/02/02 09:45:34 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2188,7 +2188,7 @@ client_input_hostkeys(struct ssh *ssh) for (i = 0; i < options.num_user_hostfiles; i++) { debug("%s: searching %s for %s / %s", __func__, options.user_hostfiles[i], ctx->host_str, - ctx->ip_str ? ctx->ip_str : "(null)"); + 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) { |