summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-10-18 07:32:51 +0200
committerDamien Miller <djm@mindrot.org>2024-10-18 07:33:29 +0200
commit5eb5c4b2820d0636b1eccee646fb32ec946c4a95 (patch)
treeddc1b48ef0f1480d6ad65c41504d8bcdee0b8807
parentupstream: in _ssh_order_hostkeyalgs() consider ECDSA curve type when (diff)
downloadopenssh-5eb5c4b2820d0636b1eccee646fb32ec946c4a95.tar.xz
openssh-5eb5c4b2820d0636b1eccee646fb32ec946c4a95.zip
upstream: ssh-keyscan doesn't need it's own sshfatal() definition, it
can use the shared one from fatal.c based on GHPR401 from lengyijun OpenBSD-Commit-ID: 8ea75ea99f27f464c9223cbc89cb046ccf9cd5c4
-rw-r--r--ssh-keyscan.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 941fa5122..2a9f47a8d 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.163 2024/10/18 04:14:59 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.164 2024/10/18 05:32:51 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -654,18 +654,6 @@ do_host(char *host)
}
}
-void
-sshfatal(const char *file, const char *func, int line, int showfunc,
- LogLevel level, const char *suffix, const char *fmt, ...)
-{
- va_list args;
-
- va_start(args, fmt);
- sshlogv(file, func, line, showfunc, level, suffix, fmt, args);
- va_end(args);
- cleanup_exit(255);
-}
-
static void
usage(void)
{