diff options
| author |   dtucker <dtucker@openbsd.org> | 2018-07-27 05:34:42 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2018-07-27 05:34:42 +0000 |
| commit | a01615b1c0d711640678bbb6a5ea68c7b416cc4a (patch) | |
| tree | 2b242d713f9a55824ca56c7613cd07a023b4a07d /usr.bin/ssh/readconf.c | |
| parent | remove errant Ed added in previous; (diff) | |
| download | wireguard-openbsd-a01615b1c0d711640678bbb6a5ea68c7b416cc4a.tar.xz wireguard-openbsd-a01615b1c0d711640678bbb6a5ea68c7b416cc4a.zip | |
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@
Diffstat (limited to 'usr.bin/ssh/readconf.c')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index bfe60f2ddfd..8115da393db 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.295 2018/07/27 05:13:02 dtucker Exp $ */ +/* $OpenBSD: readconf.c,v 1.296 2018/07/27 05:34:42 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -305,7 +305,6 @@ void add_local_forward(Options *options, const struct Forward *newfwd) { struct Forward *fwd; - extern uid_t original_real_uid; int i; /* Don't add duplicates */ @@ -465,7 +464,6 @@ execute_in_shell(const char *cmd) char *shell; pid_t pid; int devnull, status; - extern uid_t original_real_uid; if ((shell = getenv("SHELL")) == NULL) shell = _PATH_BSHELL; |