summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 7f52cc55e..8d13310f2 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.316 2020/01/23 02:46:49 dtucker Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.317 2020/01/23 07:10:22 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1924,7 +1924,7 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
1924 error("%s: fork: %s", __func__, strerror(errno)); 1924 error("%s: fork: %s", __func__, strerror(errno));
1925 return -1; 1925 return -1;
1926 } 1926 }
1927 osigchld = signal(SIGCHLD, SIG_DFL); 1927 osigchld = ssh_signal(SIGCHLD, SIG_DFL);
1928 if (pid == 0) { 1928 if (pid == 0) {
1929 close(from[0]); 1929 close(from[0]);
1930 if (dup2(from[1], STDOUT_FILENO) == -1) 1930 if (dup2(from[1], STDOUT_FILENO) == -1)
@@ -1996,11 +1996,11 @@ ssh_keysign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp,
1996 if ((r = sshbuf_get_string(b, sigp, lenp)) != 0) { 1996 if ((r = sshbuf_get_string(b, sigp, lenp)) != 0) {
1997 error("%s: buffer error: %s", __func__, ssh_err(r)); 1997 error("%s: buffer error: %s", __func__, ssh_err(r));
1998 fail: 1998 fail:
1999 signal(SIGCHLD, osigchld); 1999 ssh_signal(SIGCHLD, osigchld);
2000 sshbuf_free(b); 2000 sshbuf_free(b);
2001 return -1; 2001 return -1;
2002 } 2002 }
2003 signal(SIGCHLD, osigchld); 2003 ssh_signal(SIGCHLD, osigchld);
2004 sshbuf_free(b); 2004 sshbuf_free(b);
2005 2005
2006 return 0; 2006 return 0;