upstream: Now that ssh can't be setuid, remove the

original_real_uid and original_effective_uid globals and replace with calls
to plain getuid(). ok djm@

OpenBSD-Commit-ID: 92561c0cd418d34e6841e20ba09160583e27b68c

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 @@
-/* $OpenBSD: ssh-keysign.c,v 1.54 2018/02/23 15:58:38 markus Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.55 2018/07/27 05:34:42 dtucker Exp $ */
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
  *
@@ -62,11 +62,6 @@ struct ssh *active_state = NULL; /* XXX needed for linking */
 
 extern char *__progname;
 
-/* XXX readconf.c needs these */
-uid_t original_real_uid;
-
-extern char *__progname;
-
 static int
 valid_request(struct passwd *pw, char *host, struct sshkey **ret,
     u_char *data, size_t datalen)
@@ -201,8 +196,7 @@ main(int argc, char **argv)
         key_fd[i++] = open(_PATH_HOST_XMSS_KEY_FILE, O_RDONLY);
         key_fd[i++] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY);
 
-        original_real_uid = getuid();   /* XXX readconf.c needs this */
-        if ((pw = getpwuid(original_real_uid)) == NULL)
+        if ((pw = getpwuid(getuid())) == NULL)
                 fatal("getpwuid failed");
         pw = pwcopy(pw);