upstream: Remove support for running ssh(1) setuid and fatal if

attempted. Do not link uidwap.c into ssh any more.  Neuters
UsePrivilegedPort, which will be marked as deprecated shortly. ok markus@
djm@

OpenBSD-Commit-ID: c4ba5bf9c096f57a6ed15b713a1d7e9e2e373c42

1 files changed, 1 insertions, 4 deletions

diff --git a/readconf.c b/readconf.c
index 2bc27075f..f40eb3803 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.292 2018/07/04 13:49:31 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.293 2018/07/18 11:34:04 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -498,9 +498,6 @@ execute_in_shell(const char *cmd)
         if ((pid = fork()) == 0) {
                 char *argv[4];
 
-                /* Child.  Permanently give up superuser privileges. */
-                permanently_drop_suid(original_real_uid);
-
                 /* Redirect child stdin and stdout. Leave stderr */
                 if (dup2(devnull, STDIN_FILENO) == -1)
                         fatal("dup2: %s", strerror(errno));