diff options
Diffstat (limited to 'ssh-keysign.c')
-rw-r--r-- | ssh-keysign.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index 78bb66b08..744ecb4f9 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keysign.c,v 1.54 2018/02/23 15:58:38 markus Exp $ */ | 1 | /* $OpenBSD: ssh-keysign.c,v 1.55 2018/07/27 05:34:42 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -62,11 +62,6 @@ struct ssh *active_state = NULL; /* XXX needed for linking */ | |||
62 | 62 | ||
63 | extern char *__progname; | 63 | extern char *__progname; |
64 | 64 | ||
65 | /* XXX readconf.c needs these */ | ||
66 | uid_t original_real_uid; | ||
67 | |||
68 | extern char *__progname; | ||
69 | |||
70 | static int | 65 | static int |
71 | valid_request(struct passwd *pw, char *host, struct sshkey **ret, | 66 | valid_request(struct passwd *pw, char *host, struct sshkey **ret, |
72 | u_char *data, size_t datalen) | 67 | u_char *data, size_t datalen) |
@@ -201,8 +196,7 @@ main(int argc, char **argv) | |||
201 | key_fd[i++] = open(_PATH_HOST_XMSS_KEY_FILE, O_RDONLY); | 196 | key_fd[i++] = open(_PATH_HOST_XMSS_KEY_FILE, O_RDONLY); |
202 | key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); | 197 | key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); |
203 | 198 | ||
204 | original_real_uid = getuid(); /* XXX readconf.c needs this */ | 199 | if ((pw = getpwuid(getuid())) == NULL) |
205 | if ((pw = getpwuid(original_real_uid)) == NULL) | ||
206 | fatal("getpwuid failed"); | 200 | fatal("getpwuid failed"); |
207 | pw = pwcopy(pw); | 201 | pw = pwcopy(pw); |
208 | 202 | ||