[openssh-commits] [openssh] branch master updated: upstream: ssh-keyscan doesn't need it's own sshfatal() definition, it

git+noreply at mindrot.org git+noreply at mindrot.org
Fri Oct 18 16:33:40 AEDT 2024


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

The following commit(s) were added to refs/heads/master by this push:
     new 5eb5c4b2 upstream: ssh-keyscan doesn't need it's own sshfatal() definition, it
5eb5c4b2 is described below

commit 5eb5c4b2820d0636b1eccee646fb32ec946c4a95
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Fri Oct 18 05:32:51 2024 +0000

    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
---
 ssh-keyscan.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 941fa512..2a9f47a8 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 at 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)
 {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list