2 files changed, 32 insertions, 13 deletions

diff --git a/win32/mingw.c b/win32/mingw.c
index 712728bd6..c7eeea088 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -1109,7 +1109,7 @@ static char *getsysdir(void)
 }
 
 #define NAME_LEN 100
-static char *get_user_name(void)
+char *get_user_name(void)
 {
         static char *user_name = NULL;
         char *s;
@@ -1136,18 +1136,42 @@ static char *get_user_name(void)
         return user_name;
 }
 
+#if ENABLE_RUNUSER
+/*
+ * When runuser drops privileges TokenIsElevated still returns TRUE.
+ * Use other means to determine if we're actually unprivileged.
+ * This is likely to be fragile.
+ */
+static int
+actually_unprivileged(HANDLE h)
+{
+        DWORD restricted = 0;
+        DWORD size;
+
+        if (GetTokenInformation(h, TokenHasRestrictions, &restricted,
+                                        sizeof(restricted), &size)) {
+                // The token generated by runuser seems to 'have restrictions'.
+                return restricted != 0;
+        }
+
+        return FALSE;
+}
+#else
+# define actually_unprivileged(h) (FALSE)
+#endif
+
 int getuid(void)
 {
         int ret = DEFAULT_UID;
         HANDLE h;
 
         if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &h)) {
-                TOKEN_ELEVATION elevation;
-                DWORD size = sizeof(TOKEN_ELEVATION);
+                TOKEN_ELEVATION elevation = { 0 };
+                DWORD size;
 
                 if (GetTokenInformation(h, TokenElevation, &elevation,
                                         sizeof(elevation), &size)) {
-                        if (elevation.TokenIsElevated)
+                        if (elevation.TokenIsElevated && !actually_unprivileged(h))
                                 ret = 0;
                 }
                 CloseHandle(h);
@@ -1174,17 +1198,12 @@ struct passwd *getpwuid(uid_t uid)
 {
         static struct passwd p;
 
-        if (uid == 0) {
+        if (uid == 0)
                 p.pw_name = (char *)"root";
-                p.pw_dir = getsysdir();
-        }
-        else if (uid == DEFAULT_UID && (p.pw_name=get_user_name()) != NULL) {
-                p.pw_dir = gethomedir();
-        }
-        else {
+        else if (uid != DEFAULT_UID || (p.pw_name=get_user_name()) == NULL)
                 return NULL;
-        }
 
+        p.pw_dir = gethomedir();
         p.pw_passwd = (char *)"";
         p.pw_gecos = p.pw_name;
         p.pw_shell = NULL;
diff --git a/win32/process.c b/win32/process.c
index d78041251..0585f66a6 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -113,7 +113,7 @@ parse_interpreter(const char *cmd, interp_t *interp)
  * See https://docs.microsoft.com/en-us/cpp/cpp/main-function-command-line-args?view=vs-2019#parsing-c-command-line-arguments
  * (Parsing C++ Command-Line Arguments)
  */
-static char *
+char *
 quote_arg(const char *arg)
 {
         int len = 0, n = 0;