1 files changed, 9 insertions, 9 deletions

diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 2c90f621f..b16934114 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -456,7 +456,7 @@ get_user_primary_group (WCHAR *wlogonserver, const char *user,
 static int
 get_supplementary_group_sidlist (const char *username, cygsidlist &grp_list)
 {
-  struct __group16 *gr;
+  struct __group32 *gr;
   int cnt = 0;
 
   for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
@@ -1130,7 +1130,7 @@ write_sd(const char *file, PSECURITY_DESCRIPTOR sd_buf, DWORD sd_size)
 
 static int
 get_nt_attribute (const char *file, int *attribute,
-		  __uid16_t *uidret, __gid16_t *gidret)
+		  __uid16_t *uidret, __gid32_t *gidret)
 {
   if (!wincap.has_security ())
     return 0;
@@ -1169,7 +1169,7 @@ get_nt_attribute (const char *file, int *attribute,
     }
 
   __uid16_t uid = cygsid(owner_sid).get_uid ();
-  __gid16_t gid = cygsid(group_sid).get_gid ();
+  __gid32_t gid = cygsid(group_sid).get_gid ();
   if (uidret)
     *uidret = uid;
   if (gidret)
@@ -1279,7 +1279,7 @@ get_nt_attribute (const char *file, int *attribute,
 
 int
 get_file_attribute (int use_ntsec, const char *file,
-		    int *attribute, __uid16_t *uidret, __gid16_t *gidret)
+		    int *attribute, __uid16_t *uidret, __gid32_t *gidret)
 {
   int res;
 
@@ -1294,7 +1294,7 @@ get_file_attribute (int use_ntsec, const char *file,
   if (uidret)
     *uidret = getuid ();
   if (gidret)
-    *gidret = getgid ();
+    *gidret = getgid32 ();
 
   if (!attribute)
     return 0;
@@ -1350,7 +1350,7 @@ add_access_denied_ace (PACL acl, int offset, DWORD attributes,
 }
 
 PSECURITY_DESCRIPTOR
-alloc_sd (__uid16_t uid, __gid16_t gid, const char *logsrv, int attribute,
+alloc_sd (__uid16_t uid, __gid32_t gid, const char *logsrv, int attribute,
 	  PSECURITY_DESCRIPTOR sd_ret, DWORD *sd_size_ret)
 {
   BOOL dummy;
@@ -1378,7 +1378,7 @@ alloc_sd (__uid16_t uid, __gid16_t gid, const char *logsrv, int attribute,
 
   /* Get SID and name of new group. */
   cygsid group_sid (NO_SID);
-  struct __group16 *grp = getgrgid (gid);
+  struct __group32 *grp = getgrgid32 (gid);
   if (grp)
     {
       if ((!grp || !group_sid.getfromgr (grp))
@@ -1619,7 +1619,7 @@ set_security_attribute (int attribute, PSECURITY_ATTRIBUTES psa,
 }
 
 static int
-set_nt_attribute (const char *file, __uid16_t uid, __gid16_t gid,
+set_nt_attribute (const char *file, __uid16_t uid, __gid32_t gid,
 		  const char *logsrv, int attribute)
 {
   if (!wincap.has_security ())
@@ -1645,7 +1645,7 @@ set_nt_attribute (const char *file, __uid16_t uid, __gid16_t gid,
 
 int
 set_file_attribute (int use_ntsec, const char *file,
-		    __uid16_t uid, __gid16_t gid,
+		    __uid16_t uid, __gid32_t gid,
 		    int attribute, const char *logsrv)
 {
   int ret = 0;