diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2025-04-09 14:48:56 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2025-04-09 19:45:50 +0000 |
| commit | 9792a032f0a99557271d6b7f7b0a955386c1fdbe (patch) | |
| tree | fffe2fb734d6754ae63284d06db6bef8bb091a84 /ssh-keyscan.c | |
| parent | de47678f9822eb19289056cce942a43a29e28c06 (diff) | |
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index f34e05678a1d..3436c0b5c7c6 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.161 2024/09/09 02:39:57 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.165 2024/12/06 15:17:15 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -588,7 +588,7 @@ conloop(void) for (i = 0; i < maxfd; i++) { if (read_wait[i].revents & (POLLHUP|POLLERR|POLLNVAL)) confree(i); - else if (read_wait[i].revents & (POLLIN|POLLHUP)) + else if (read_wait[i].revents & (POLLIN)) conread(i); } @@ -650,22 +650,10 @@ do_host(char *host) if (addr_cmp(&addr, &end_addr) == 0) break; addr_increment(&addr); - }; + } } } -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) { @@ -814,6 +802,7 @@ main(int argc, char **argv) for (j = 0; j < maxfd; j++) read_wait[j].fd = -1; + ssh_signal(SIGPIPE, SIG_IGN); for (j = 0; j < fopt_count; j++) { if (argv[j] == NULL) fp = stdin; |