summaryrefslogtreecommitdiff
path: root/ssh-keysign.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh-keysign.c')
-rw-r--r--ssh-keysign.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 601f6ca72..6cfd5b46c 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.56 2018/11/23 05:08:07 djm Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.61 2019/10/02 00:42:30 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -31,6 +31,7 @@
31#endif 31#endif
32#include <pwd.h> 32#include <pwd.h>
33#include <stdarg.h> 33#include <stdarg.h>
34#include <stdio.h>
34#include <stdlib.h> 35#include <stdlib.h>
35#include <string.h> 36#include <string.h>
36#include <unistd.h> 37#include <unistd.h>
@@ -56,7 +57,6 @@
56#include "pathnames.h" 57#include "pathnames.h"
57#include "readconf.h" 58#include "readconf.h"
58#include "uidswap.h" 59#include "uidswap.h"
59#include "sshkey.h"
60#include "ssherr.h" 60#include "ssherr.h"
61 61
62extern char *__progname; 62extern char *__progname;
@@ -173,7 +173,6 @@ main(int argc, char **argv)
173 char *host, *fp; 173 char *host, *fp;
174 size_t slen, dlen; 174 size_t slen, dlen;
175 175
176 ssh_malloc_init(); /* must be called before any mallocs */
177 if (pledge("stdio rpath getpw dns id", NULL) != 0) 176 if (pledge("stdio rpath getpw dns id", NULL) != 0)
178 fatal("%s: pledge: %s", __progname, strerror(errno)); 177 fatal("%s: pledge: %s", __progname, strerror(errno));
179 178
@@ -252,7 +251,7 @@ main(int argc, char **argv)
252 if ((r = sshbuf_get_u32(b, (u_int *)&fd)) != 0) 251 if ((r = sshbuf_get_u32(b, (u_int *)&fd)) != 0)
253 fatal("%s: buffer error: %s", __progname, ssh_err(r)); 252 fatal("%s: buffer error: %s", __progname, ssh_err(r));
254 if (fd < 0 || fd == STDIN_FILENO || fd == STDOUT_FILENO) 253 if (fd < 0 || fd == STDIN_FILENO || fd == STDOUT_FILENO)
255 fatal("bad fd"); 254 fatal("bad fd = %d", fd);
256 if ((host = get_local_name(fd)) == NULL) 255 if ((host = get_local_name(fd)) == NULL)
257 fatal("cannot get local name for fd"); 256 fatal("cannot get local name for fd");
258 257