From: Chris Koeritz <cak0l@virginia.edu>
Date: Thu, 4 Jun 2020 18:10:16 +0000 (-0400)
Subject: revised sudo implementation to fix centos
X-Git-Tag: 2.140.123^2~6^2~8
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=60f032e75addcfbffaf0399b512bf37c10ebc8c6;p=feisty_meow.git

revised sudo implementation to fix centos
---

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 44f6155d..d392c234 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -439,7 +439,10 @@ if [ -z "$skip_all" ]; then
     # launch sudo with just the variables we want to reach the other side.
     # we take an extra step to null out the PATH, since MacOS seems to want
     # to pass that even for a login shell (-i) somehow.
-    PATH= /usr/bin/sudo --preserve-env=SSH_AUTH_SOCK,IMPORTED_XAUTH "$@"
+    local varmods="PATH= "
+    if [ ! -z "$IMPORTED_XAUTH" ]; then varmods+="IMPORTED_XAUTH=$IMPORTED_XAUTH "; fi
+    if [ ! -z "$SSH_AUTH_SOCK" ]; then varmods+="SSH_AUTH_SOCK=$SSH_AUTH_SOCK"; fi
+    /usr/bin/sudo $varmods "$@"
     retval=$?
 
     # take the xauth info away again if it wasn't set already.