* uinfo.cc (internal_getlogin): Try evaluating user by SID even if

	ntsec is off.
	(uinfo_init): Set primary group even if ntsec is off.

2 files changed, 84 insertions, 78 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7ed9f8d19..85a330298 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	Patch suggested by Pierre A. Humblet <Pierre.Humblet@ieee.org>:
+	* uinfo.cc (internal_getlogin): Try evaluating user by SID even if
+	ntsec is off.
+	(uinfo_init): Set primary group even if ntsec is off.
+
 2002-02-09  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/cygwin/grp.h: New file.
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index c128d8a44..db2be6bf2 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -127,91 +127,90 @@ internal_getlogin (cygheap_user &user)
 	    NetApiBufferFree (ui);
 	}
 
-      if (allow_ntsec)
-	{
-	  HANDLE ptok = user.token; /* Which is INVALID_HANDLE_VALUE if no
-				       impersonation took place. */
-	  DWORD siz;
-	  cygsid tu;
-	  int ret = 0;
+      HANDLE ptok = user.token; /* Which is INVALID_HANDLE_VALUE if no
+				   impersonation took place. */
+      DWORD siz;
+      cygsid tu;
+      ret = 0;
 
-	  /* Try to get the SID either from already impersonated token
-	     or from current process first. To differ that two cases is
-	     important, because you can't rely on the user information
-	     in a process token of a currently impersonated process. */
-	  if (ptok == INVALID_HANDLE_VALUE
-	      && !OpenProcessToken (GetCurrentProcess (),
-				    TOKEN_ADJUST_DEFAULT | TOKEN_QUERY,
-				    &ptok))
-	    debug_printf ("OpenProcessToken(): %E\n");
-	  else if (!GetTokenInformation (ptok, TokenUser, &tu, sizeof tu, &siz))
-	    debug_printf ("GetTokenInformation(): %E");
-	  else if (!(ret = user.set_sid (tu)))
-	    debug_printf ("Couldn't retrieve SID from access token!");
-	  /* If that failes, try to get the SID from localhost. This can only
-	     be done if a domain is given because there's a chance that a local
-	     and a domain user may have the same name. */
-	  if (!ret && user.domain ())
-	    {
-	      /* Concat DOMAIN\USERNAME for the next lookup */
-	      strcat (strcat (strcpy (buf, user.domain ()), "\\"), user.name ());
-	      if (!(ret = lookup_name (buf, NULL, user.sid ())))
-		debug_printf ("Couldn't retrieve SID locally!");
-	    }
-
-	  /* If that fails, too, as a last resort try to get the SID from
-	     the logon server. */
-	  if (!ret && !(ret = lookup_name (user.name (), user.logsrv (),
-					   user.sid ())))
-	    debug_printf ("Couldn't retrieve SID from '%s'!", user.logsrv ());
+      /* Try to get the SID either from already impersonated token
+	 or from current process first. To differ that two cases is
+	 important, because you can't rely on the user information
+	 in a process token of a currently impersonated process. */
+      if (ptok == INVALID_HANDLE_VALUE
+	  && !OpenProcessToken (GetCurrentProcess (),
+				TOKEN_ADJUST_DEFAULT | TOKEN_QUERY,
+				&ptok))
+	debug_printf ("OpenProcessToken(): %E\n");
+      else if (!GetTokenInformation (ptok, TokenUser, &tu, sizeof tu, &siz))
+	debug_printf ("GetTokenInformation(): %E");
+      else if (!(ret = user.set_sid (tu)))
+	debug_printf ("Couldn't retrieve SID from access token!");
+      /* If that failes, try to get the SID from localhost. This can only
+	 be done if a domain is given because there's a chance that a local
+	 and a domain user may have the same name. */
+      if (!ret && user.domain ())
+	{
+	  /* Concat DOMAIN\USERNAME for the next lookup */
+	  strcat (strcat (strcpy (buf, user.domain ()), "\\"), user.name ());
+	  if (!(ret = lookup_name (buf, NULL, user.sid ())))
+	    debug_printf ("Couldn't retrieve SID locally!");
+	}
 
-	  /* If we have a SID, try to get the corresponding Cygwin user name
-	     which can be different from the Windows user name. */
-	  cygsid gsid (NO_SID);
-	  if (ret)
-	    {
-	      cygsid psid;
+      /* If that fails, too, as a last resort try to get the SID from
+	 the logon server. */
+      if (!ret && !(ret = lookup_name (user.name (), user.logsrv (),
+				       user.sid ())))
+	debug_printf ("Couldn't retrieve SID from '%s'!", user.logsrv ());
 
-	      for (int pidx = 0; (pw = internal_getpwent (pidx)); ++pidx)
-		if (psid.getfrompw (pw) && EqualSid (user.sid (), psid))
-		  {
-		    user.set_name (pw->pw_name);
-		    struct group *gr = getgrgid (pw->pw_gid);
-		    if (gr)
-		      if (!gsid.getfromgr (gr))
-			  gsid = NO_SID;
-		    break;
-		  }
-	      if (!strcasematch (user.name (), "SYSTEM")
-		  && user.domain () && user.logsrv ())
-		{
-		  if (get_registry_hive_path (user.sid (), buf))
-		    setenv ("USERPROFILE", buf, 1);
-		  else
-		    unsetenv ("USERPROFILE");
-		}
-	    }
+      /* If we have a SID, try to get the corresponding Cygwin user name
+	 which can be different from the Windows user name. */
+      cygsid gsid (NO_SID);
+      if (ret)
+	{
+	  cygsid psid;
 
-	  /* If this process is started from a non Cygwin process,
-	     set token owner to the same value as token user and
-	     primary group to the group which is set as primary group
-	     in /etc/passwd. */
-	  if (ptok != INVALID_HANDLE_VALUE && myself->ppid == 1)
+	  for (int pidx = 0; (pw = internal_getpwent (pidx)); ++pidx)
+	    if (psid.getfrompw (pw) && EqualSid (user.sid (), psid))
+	      {
+		user.set_name (pw->pw_name);
+		struct group *gr = getgrgid (pw->pw_gid);
+		if (gr)
+		  if (!gsid.getfromgr (gr))
+		      gsid = NO_SID;
+		break;
+	      }
+	  if (!strcasematch (user.name (), "SYSTEM")
+	      && user.domain () && user.logsrv ())
 	    {
-	      if (!SetTokenInformation (ptok, TokenOwner, &tu, sizeof tu))
-		debug_printf ("SetTokenInformation(TokenOwner): %E");
-	      if (gsid && !SetTokenInformation (ptok, TokenPrimaryGroup,
-						&gsid, sizeof gsid))
-		debug_printf ("SetTokenInformation(TokenPrimaryGroup): %E");
+	      if (get_registry_hive_path (user.sid (), buf))
+		setenv ("USERPROFILE", buf, 1);
+	      else
+		unsetenv ("USERPROFILE");
 	    }
+	}
 
-	  /* Close token only if it's a result from OpenProcessToken(). */
-	  if (ptok != INVALID_HANDLE_VALUE
-	      && user.token == INVALID_HANDLE_VALUE)
-	    CloseHandle (ptok);
+      /* If this process is started from a non Cygwin process,
+	 set token owner to the same value as token user and
+	 primary group to the group which is set as primary group
+	 in /etc/passwd. */
+      if (ptok != INVALID_HANDLE_VALUE && myself->ppid == 1)
+	{
+	  if (!SetTokenInformation (ptok, TokenOwner, &tu, sizeof tu))
+	    debug_printf ("SetTokenInformation(TokenOwner): %E");
+	  if (gsid && !SetTokenInformation (ptok, TokenPrimaryGroup,
+					    &gsid, sizeof gsid))
+	    debug_printf ("SetTokenInformation(TokenPrimaryGroup): %E");
 	}
+
+      /* Close token only if it's a result from OpenProcessToken(). */
+      if (ptok != INVALID_HANDLE_VALUE
+	  && user.token == INVALID_HANDLE_VALUE)
+	CloseHandle (ptok);
     }
+
   debug_printf ("Cygwins Username: %s", user.name ());
+
   if (!pw)
     pw = getpwnam(user.name ());
   if (!getenv ("HOME"))
@@ -256,9 +255,9 @@ uinfo_init ()
     if ((p = internal_getlogin (cygheap->user)) != NULL)
       {
 	myself->uid = p->pw_uid;
-	/* Set primary group only if ntsec is off or the process has been
-	   started from a non cygwin process. */
-	if (!allow_ntsec || myself->ppid == 1)
+	/* Set primary group only if process has been started from a
+	   non cygwin process. */
+	if (myself->ppid == 1)
 	  myself->gid = p->pw_gid;
       }
     else