* uinfo.cc (internal_getlogin): Only update user.groups.pgsid

	if the call to set the primary group succeeds.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4065d80..472b838 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-27  Pierre Humblet  <pierre.humblet@ieee.org>
+
+       * uinfo.cc (internal_getlogin): Only update user.groups.pgsid
+       if the call to set the primary group succeeds.
+
 2003-02-27  Christopher Faylor  <cgf@redhat.com>
 
        * cygthread::detach: Improve error message.

diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index cb620d8..6b07ea4 100644 (file)
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -83,10 +83,11 @@ internal_getlogin (cygheap_user &user)
          if (gsid.getfromgr (internal_getgrgid (pw->pw_gid)))
            {
              /* Set primary group to the group in /etc/passwd. */
-             user.groups.pgsid = gsid;
              if (!SetTokenInformation (ptok, TokenPrimaryGroup,
                                        &gsid, sizeof gsid))
                debug_printf ("SetTokenInformation(TokenPrimaryGroup): %E");
+             else
+               user.groups.pgsid = gsid;
            }
          else
            debug_printf ("gsid not found in augmented /etc/group");