1 files changed, 124 insertions, 25 deletions

diff --git a/src/w32.c b/src/w32.c
index 5a8289789da..2395c236769 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -120,6 +120,8 @@ static BOOL g_b_init_open_process_token;
 static BOOL g_b_init_get_token_information;
 static BOOL g_b_init_lookup_account_sid;
 static BOOL g_b_init_get_sid_identifier_authority;
+static BOOL g_b_init_get_sid_sub_authority;
+static BOOL g_b_init_get_sid_sub_authority_count;
 
 /*
   BEGIN: Wrapper functions around OpenProcessToken
@@ -161,6 +163,12 @@ typedef BOOL (WINAPI * LookupAccountSid_Proc) (
     PSID_NAME_USE peUse);
 typedef PSID_IDENTIFIER_AUTHORITY (WINAPI * GetSidIdentifierAuthority_Proc) (
     PSID pSid);
+typedef PDWORD (WINAPI * GetSidSubAuthority_Proc) (
+    PSID pSid,
+    DWORD n);
+typedef PUCHAR (WINAPI * GetSidSubAuthorityCount_Proc) (
+    PSID pSid);
+
 
   /* ** A utility function ** */
 static BOOL
@@ -349,6 +357,57 @@ PSID_IDENTIFIER_AUTHORITY WINAPI get_sid_identifier_authority (
   return (s_pfn_Get_Sid_Identifier_Authority (pSid));
 }
 
+PDWORD WINAPI get_sid_sub_authority (
+    PSID pSid,
+    DWORD n)
+{
+  static GetSidSubAuthority_Proc s_pfn_Get_Sid_Sub_Authority = NULL;
+  static DWORD zero = 0U;
+  HMODULE hm_advapi32 = NULL;
+  if (is_windows_9x () == TRUE)
+    {
+      return &zero;
+    }
+  if (g_b_init_get_sid_sub_authority == 0)
+    {
+      g_b_init_get_sid_sub_authority = 1;
+      hm_advapi32 = LoadLibrary ("Advapi32.dll");
+      s_pfn_Get_Sid_Sub_Authority =
+        (GetSidSubAuthority_Proc) GetProcAddress (
+            hm_advapi32, "GetSidSubAuthority");
+    }
+  if (s_pfn_Get_Sid_Sub_Authority == NULL)
+    {
+      return &zero;
+    }
+  return (s_pfn_Get_Sid_Sub_Authority (pSid, n));
+}
+
+PUCHAR WINAPI get_sid_sub_authority_count (
+    PSID pSid)
+{
+  static GetSidSubAuthorityCount_Proc s_pfn_Get_Sid_Sub_Authority_Count = NULL;
+  static UCHAR zero = 0U;
+  HMODULE hm_advapi32 = NULL;
+  if (is_windows_9x () == TRUE)
+    {
+      return &zero;
+    }
+  if (g_b_init_get_sid_sub_authority_count == 0)
+    {
+      g_b_init_get_sid_sub_authority_count = 1;
+      hm_advapi32 = LoadLibrary ("Advapi32.dll");
+      s_pfn_Get_Sid_Sub_Authority_Count =
+        (GetSidSubAuthorityCount_Proc) GetProcAddress (
+            hm_advapi32, "GetSidSubAuthorityCount");
+    }
+  if (s_pfn_Get_Sid_Sub_Authority_Count == NULL)
+    {
+      return &zero;
+    }
+  return (s_pfn_Get_Sid_Sub_Authority_Count (pSid));
+}
+
 /*
   END: Wrapper functions around OpenProcessToken
   and other functions in advapi32.dll that are only
@@ -547,39 +606,47 @@ init_user_info ()
                              domain, &dlength, &user_type))
     {
       strcpy (the_passwd.pw_name, name);
-      /* Determine a reasonable uid value. */
+      /* Determine a reasonable uid value.  */
       if (stricmp ("administrator", name) == 0)
         {
-          the_passwd.pw_uid = 0;
-          the_passwd.pw_gid = 0;
+          the_passwd.pw_uid = 500; /* well-known Administrator uid */
+          the_passwd.pw_gid = 513; /* well-known None gid */
         }
       else
         {
-          SID_IDENTIFIER_AUTHORITY * pSIA;
-
-          pSIA = get_sid_identifier_authority (*((PSID *) user_sid));
-          /* I believe the relative portion is the last 4 bytes (of 6)
-             with msb first. */
-          the_passwd.pw_uid = ((pSIA->Value[2] << 24) +
-                               (pSIA->Value[3] << 16) +
-                               (pSIA->Value[4] << 8)  +
-                               (pSIA->Value[5] << 0));
-          /* restrict to conventional uid range for normal users */
-          the_passwd.pw_uid = the_passwd.pw_uid % 60001;
+          /* Use the last sub-authority value of the RID, the relative
+             portion of the SID, as user/group ID. */
+          DWORD n_subauthorities =
+            *get_sid_sub_authority_count (*((PSID *) user_sid));
+
+          if (n_subauthorities < 1)
+            the_passwd.pw_uid = 0;      /* the "World" RID */
+          else
+            {
+              the_passwd.pw_uid =
+                *get_sid_sub_authority (*((PSID *) user_sid),
+                                        n_subauthorities - 1);
+              /* Restrict to conventional uid range for normal users.  */
+              the_passwd.pw_uid %= 60001;
+            }
 
           /* Get group id */
           if (get_token_information (token, TokenPrimaryGroup,
                                      (PVOID) user_sid, sizeof (user_sid), &trash))
             {
-              SID_IDENTIFIER_AUTHORITY * pSIA;
-
-              pSIA = get_sid_identifier_authority (*((PSID *) user_sid));
-              the_passwd.pw_gid = ((pSIA->Value[2] << 24) +
-                                   (pSIA->Value[3] << 16) +
-                                   (pSIA->Value[4] << 8)  +
-                                   (pSIA->Value[5] << 0));
-              /* I don't know if this is necessary, but for safety... */
-              the_passwd.pw_gid = the_passwd.pw_gid % 60001;
+              n_subauthorities =
+                *get_sid_sub_authority_count (*((PSID *) user_sid));
+
+              if (n_subauthorities < 1)
+                the_passwd.pw_gid = 0;  /* the "World" RID */
+              else
+                {
+                  the_passwd.pw_gid =
+                    *get_sid_sub_authority (*((PSID *) user_sid),
+                                            n_subauthorities - 1);
+                  /* I don't know if this is necessary, but for safety...  */
+                  the_passwd.pw_gid %= 60001;
+                }
             }
           else
             the_passwd.pw_gid = the_passwd.pw_uid;
@@ -1938,6 +2005,36 @@ unc_volume_file_attributes (const char *path)
   return attrs;
 }
 
+/* Ensure a network connection is authenticated.  */
+static void
+logon_network_drive (const char *path)
+{
+  NETRESOURCE resource;
+  char share[MAX_PATH];
+  int i, n_slashes;
+
+  /* Only logon to networked drives.  */
+  if (!IS_DIRECTORY_SEP (path[0]) || !IS_DIRECTORY_SEP (path[1]))
+    return;
+  n_slashes = 2;
+  strncpy (share, path, MAX_PATH);
+  /* Truncate to just server and share name.  */
+  for (i = 2; i < MAX_PATH; i++)
+    {
+      if (IS_DIRECTORY_SEP (share[i]) && ++n_slashes > 3)
+        {
+          share[i] = '\0';
+          break;
+        }
+    }
+
+  resource.dwType = RESOURCETYPE_DISK;
+  resource.lpLocalName = NULL;
+  resource.lpRemoteName = share;
+  resource.lpProvider = NULL;
+
+  WNetAddConnection2 (&resource, NULL, NULL, CONNECT_INTERACTIVE);
+}
 
 /* Shadow some MSVC runtime functions to map requests for long filenames
    to reasonable short names if necessary.  This was originally added to
@@ -2495,6 +2592,8 @@ stat (const char * path, struct stat * buf)
         }
       else
         {
+          logon_network_drive (name);
+
           fh = FindFirstFile (name, &wfd);
           if (fh == INVALID_HANDLE_VALUE)
             {
@@ -2668,8 +2767,8 @@ fstat (int desc, struct stat * buf)
     buf->st_ino = fake_inode;
 
   /* consider files to belong to current user */
-  buf->st_uid = 0;
-  buf->st_gid = 0;
+  buf->st_uid = the_passwd.pw_uid;
+  buf->st_gid = the_passwd.pw_gid;
 
   buf->st_dev = info.dwVolumeSerialNumber;
   buf->st_rdev = info.dwVolumeSerialNumber;