1 files changed, 116 insertions, 116 deletions

diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index fc3f8bf..a0f9ae8 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -40,130 +40,130 @@ internal_getlogin (_pinfo *pi)
 
       /* First trying to get logon info from environment */
       if ((env = getenv ("USERNAME")) != NULL)
-        un = env;
+	un = env;
       if ((env = getenv ("LOGONSERVER")) != NULL)
-        strcpy (pi->logsrv, env + 2); /* filter leading double backslashes */
+	strcpy (pi->logsrv, env + 2); /* filter leading double backslashes */
       if ((env = getenv ("USERDOMAIN")) != NULL)
-        strcpy (pi->domain, env);
+	strcpy (pi->domain, env);
       /* Trust only if usernames are identical */
       if (un && strcasematch (pi->username, un)
-          && pi->domain[0] && pi->logsrv[0])
-        debug_printf ("Domain: %s, Logon Server: %s", pi->domain, pi->logsrv);
+	  && pi->domain[0] && pi->logsrv[0])
+	debug_printf ("Domain: %s, Logon Server: %s", pi->domain, pi->logsrv);
       /* If that failed, try to get that info from NetBIOS */
       else if (!NetWkstaUserGetInfo (NULL, 1, (LPBYTE *)&wui))
-        {
-          sys_wcstombs (pi->username, wui->wkui1_username, MAX_USER_NAME);
-          sys_wcstombs (pi->logsrv, wui->wkui1_logon_server, MAX_HOST_NAME);
-          sys_wcstombs (pi->domain, wui->wkui1_logon_domain,
-                        MAX_COMPUTERNAME_LENGTH + 1);
-          /* Save values in environment */
-          if (!strcasematch (pi->username, "SYSTEM")
-              && pi->domain[0] && pi->logsrv[0])
-            {
-              LPUSER_INFO_3 ui = NULL;
-              WCHAR wbuf[MAX_HOST_NAME + 2];
+	{
+	  sys_wcstombs (pi->username, wui->wkui1_username, MAX_USER_NAME);
+	  sys_wcstombs (pi->logsrv, wui->wkui1_logon_server, MAX_HOST_NAME);
+	  sys_wcstombs (pi->domain, wui->wkui1_logon_domain,
+			MAX_COMPUTERNAME_LENGTH + 1);
+	  /* Save values in environment */
+	  if (!strcasematch (pi->username, "SYSTEM")
+	      && pi->domain[0] && pi->logsrv[0])
+	    {
+	      LPUSER_INFO_3 ui = NULL;
+	      WCHAR wbuf[MAX_HOST_NAME + 2];
 
-              strcat (strcpy (buf, "\\\\"), pi->logsrv);
-              setenv ("USERNAME", pi->username, 1);
-              setenv ("LOGONSERVER", buf, 1);
-              setenv ("USERDOMAIN", pi->domain, 1);
-              /* HOMEDRIVE and HOMEPATH are wrong most of the time, too,
-                 after changing user context! */
-              sys_mbstowcs (wbuf, buf, MAX_HOST_NAME + 2);
-              if (!NetUserGetInfo (NULL, wui->wkui1_username, 3, (LPBYTE *)&ui)
-                  || !NetUserGetInfo (wbuf,wui->wkui1_username,3,(LPBYTE *)&ui))
-                {
-                  sys_wcstombs (buf, ui->usri3_home_dir, MAX_PATH);
-                  if (!buf[0])
-                    {
-                      sys_wcstombs (buf, ui->usri3_home_dir_drive, MAX_PATH);
-                      if (buf[0])
-                        strcat (buf, "\\");
-                      else
-                        {
-                          env = getenv ("SYSTEMDRIVE");
-                          if (env && *env)
-                            strcat (strcpy (buf, env), "\\");
-                          else
-                            GetSystemDirectoryA (buf, MAX_PATH);
-                        }
-                    }
-                  setenv ("HOMEPATH", buf + 2, 1);
-                  buf[2] = '\0';
-                  setenv ("HOMEDRIVE", buf, 1);
-                  NetApiBufferFree (ui);
-                }
-            }
-          debug_printf ("Domain: %s, Logon Server: %s, Windows Username: %s",
-                        pi->domain, pi->logsrv, pi->username);
-          NetApiBufferFree (wui);
-        }
+	      strcat (strcpy (buf, "\\\\"), pi->logsrv);
+	      setenv ("USERNAME", pi->username, 1);
+	      setenv ("LOGONSERVER", buf, 1);
+	      setenv ("USERDOMAIN", pi->domain, 1);
+	      /* HOMEDRIVE and HOMEPATH are wrong most of the time, too,
+		 after changing user context! */
+	      sys_mbstowcs (wbuf, buf, MAX_HOST_NAME + 2);
+	      if (!NetUserGetInfo (NULL, wui->wkui1_username, 3, (LPBYTE *)&ui)
+		  || !NetUserGetInfo (wbuf,wui->wkui1_username,3,(LPBYTE *)&ui))
+		{
+		  sys_wcstombs (buf, ui->usri3_home_dir, MAX_PATH);
+		  if (!buf[0])
+		    {
+		      sys_wcstombs (buf, ui->usri3_home_dir_drive, MAX_PATH);
+		      if (buf[0])
+			strcat (buf, "\\");
+		      else
+			{
+			  env = getenv ("SYSTEMDRIVE");
+			  if (env && *env)
+			    strcat (strcpy (buf, env), "\\");
+			  else
+			    GetSystemDirectoryA (buf, MAX_PATH);
+			}
+		    }
+		  setenv ("HOMEPATH", buf + 2, 1);
+		  buf[2] = '\0';
+		  setenv ("HOMEDRIVE", buf, 1);
+		  NetApiBufferFree (ui);
+		}
+	    }
+	  debug_printf ("Domain: %s, Logon Server: %s, Windows Username: %s",
+			pi->domain, pi->logsrv, pi->username);
+	  NetApiBufferFree (wui);
+	}
       if (allow_ntsec)
-        {
-          HANDLE ptok = pi->token; /* Which is INVALID_HANDLE_VALUE if no
-                                      impersonation took place. */
-          DWORD siz;
-          char tu[1024];
-          int 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_QUERY, &ptok))
-            debug_printf ("OpenProcessToken(): %E\n");
-          else if (!GetTokenInformation (ptok, TokenUser, (LPVOID) &tu,
-                                         sizeof tu, &siz))
-            debug_printf ("GetTokenInformation(): %E");
-          else if (!(ret = CopySid (MAX_SID_LEN, (PSID) pi->psid,
-                                    ((TOKEN_USER *) &tu)->User.Sid)))
-            debug_printf ("Couldn't retrieve SID from access token!");
-          /* Close token only if it's a result from OpenProcessToken(). */
-          if (ptok != INVALID_HANDLE_VALUE && pi->token == INVALID_HANDLE_VALUE)
-            CloseHandle (ptok);
+	{
+	  HANDLE ptok = pi->token; /* Which is INVALID_HANDLE_VALUE if no
+				      impersonation took place. */
+	  DWORD siz;
+	  char tu[1024];
+	  int 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_QUERY, &ptok))
+	    debug_printf ("OpenProcessToken(): %E\n");
+	  else if (!GetTokenInformation (ptok, TokenUser, (LPVOID) &tu,
+					 sizeof tu, &siz))
+	    debug_printf ("GetTokenInformation(): %E");
+	  else if (!(ret = CopySid (MAX_SID_LEN, (PSID) pi->psid,
+				    ((TOKEN_USER *) &tu)->User.Sid)))
+	    debug_printf ("Couldn't retrieve SID from access token!");
+	  /* Close token only if it's a result from OpenProcessToken(). */
+	  if (ptok != INVALID_HANDLE_VALUE && pi->token == INVALID_HANDLE_VALUE)
+	    CloseHandle (ptok);
 
-          /* 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 && pi->domain[0])
-            {
-              /* Concat DOMAIN\USERNAME for the next lookup */
-              strcat (strcat (strcpy (buf, pi->domain), "\\"), pi->username);
-              if (!(ret = lookup_name (buf, NULL, (PSID) pi->psid)))
-                debug_printf ("Couldn't retrieve SID locally!");
-            }
+	  /* 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 && pi->domain[0])
+	    {
+	      /* Concat DOMAIN\USERNAME for the next lookup */
+	      strcat (strcat (strcpy (buf, pi->domain), "\\"), pi->username);
+	      if (!(ret = lookup_name (buf, NULL, (PSID) pi->psid)))
+		debug_printf ("Couldn't retrieve SID locally!");
+	    }
 
-          /* If that failes, too, as a last resort try to get the SID from
-             the logon server. */
-          if (!ret && !(ret = lookup_name(pi->username, pi->logsrv,
-                                          (PSID)pi->psid)))
-            debug_printf ("Couldn't retrieve SID from '%s'!", pi->logsrv);
+	  /* If that failes, too, as a last resort try to get the SID from
+	     the logon server. */
+	  if (!ret && !(ret = lookup_name(pi->username, pi->logsrv,
+					  (PSID)pi->psid)))
+	    debug_printf ("Couldn't retrieve SID from '%s'!", pi->logsrv);
 
-          /* If we have a SID, try to get the corresponding Cygwin user name
-             which can be different from the Windows user name. */
-          if (ret)
-            {
-              struct passwd *pw;
-              char psidbuf[MAX_SID_LEN];
-              PSID psid = (PSID) psidbuf;
+	  /* If we have a SID, try to get the corresponding Cygwin user name
+	     which can be different from the Windows user name. */
+	  if (ret)
+	    {
+	      struct passwd *pw;
+	      char psidbuf[MAX_SID_LEN];
+	      PSID psid = (PSID) psidbuf;
 
-              pi->use_psid = 1;
-              if (!strcasematch (pi->username, "SYSTEM")
-                  && pi->domain[0] && pi->logsrv[0])
-                {
-                  if (get_registry_hive_path (pi->psid, buf))
-                    setenv ("USERPROFILE", buf, 1);
-                }
-              while ((pw = getpwent ()) != NULL)
-                if (get_pw_sid (psid, pw) && EqualSid (pi->psid, psid))
-                  {
-                    strcpy (pi->username, pw->pw_name);
-                    break;
-                  }
-              endpwent ();
-            }
-        }
+	      pi->use_psid = 1;
+	      if (!strcasematch (pi->username, "SYSTEM")
+		  && pi->domain[0] && pi->logsrv[0])
+		{
+		  if (get_registry_hive_path (pi->psid, buf))
+		    setenv ("USERPROFILE", buf, 1);
+		}
+	      while ((pw = getpwent ()) != NULL)
+		if (get_pw_sid (psid, pw) && EqualSid (pi->psid, psid))
+		  {
+		    strcpy (pi->username, pw->pw_name);
+		    break;
+		  }
+	      endpwent ();
+	    }
+	}
     }
   debug_printf ("Cygwins Username: %s", pi->username);
   return pi->username;
@@ -187,13 +187,13 @@ uinfo_init ()
   if (myself->uid == USHRT_MAX)
     if ((p = getpwnam (username = internal_getlogin (myself))) != NULL)
       {
-        myself->uid = p->pw_uid;
-        myself->gid = p->pw_gid;
+	myself->uid = p->pw_uid;
+	myself->gid = p->pw_gid;
       }
     else
       {
-        myself->uid = DEFAULT_UID;
-        myself->gid = DEFAULT_GID;
+	myself->uid = DEFAULT_UID;
+	myself->gid = DEFAULT_GID;
       }
   /* Real and effective uid/gid are always identical on process start up.
      This is at least true for NT/W2K. */