]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Output (none) in debug in the case in the CheckHostIP=no case
authordtucker@openbsd.org <dtucker@openbsd.org>
Sun, 2 Feb 2020 09:45:34 +0000 (09:45 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sun, 2 Feb 2020 10:18:07 +0000 (21:18 +1100)
as suggested by markus@

OpenBSD-Commit-ID: 4ab9117ee5261cbbd1868717fcc3142eea6385cf

clientloop.c

index c5b7f19cde84233026b1d3d234a91e962fdd1e24..ebd0dbca186f089a2e5d66d99ca462e720a64aab 100644 (file)
@@ -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) {