From ca49a78d0571ee33d52e8697a45fac5d35ab5ae2 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 27 Jul 2018 05:34:43 +0000 Subject: 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@ --- usr.bin/ssh/sshconnect.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'usr.bin/ssh/sshconnect.c') diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index deac097a0ca..359264edc6a 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.303 2018/07/19 23:03:16 dtucker Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.304 2018/07/27 05:34:42 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -67,8 +67,6 @@ static pid_t proxy_command_pid = 0; /* import */ extern Options options; extern char *__progname; -extern uid_t original_real_uid; -extern uid_t original_effective_uid; static int show_other_keys(struct hostkeys *, struct sshkey *); static void warn_changed_key(struct sshkey *); -- cgit v1.2.3