* cygheap.h: Move `token' and `impersonated' from class _pinfo

        to class cygheap_user.
        * pinfo.h: Ditto.
        * fork.cc (fork_child): Change usage of `token' and `impersonated'
        accordingly.
        (fork_parent): Ditto.
        * security.cc (cygwin_set_impersonation_token): Ditto.
        * sigproc.cc (proc_subproc): Ditto.
        * spawn.cc (spawn_guts): Ditto.
        * syscalls.cc (seteuid): Ditto.
        * uinfo.cc (uinfo_init): Ditto.

1 files changed, 9 insertions, 5 deletions

diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index 779df67..c39438a 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -57,17 +57,21 @@ class cygheap_user {
   /* Extendend user information.
      The information is derived from the internal_getlogin call
      when on a NT system. */
-  char *pname;         /* user's name */
-  char *plogsrv;       /* Logon server, may be FQDN */
-  char *pdomain;       /* Logon domain of the user */
-  PSID  psid;          /* buffer for user's SID */
-
+  char  *pname;         /* user's name */
+  char  *plogsrv;       /* Logon server, may be FQDN */
+  char  *pdomain;       /* Logon domain of the user */
+  PSID   psid;          /* buffer for user's SID */
 public:
   uid_t orig_uid;      /* Remains intact even after impersonation */
   uid_t orig_gid;      /* Ditto */
   uid_t real_uid;      /* Remains intact on seteuid, replaced by setuid */
   gid_t real_gid;      /* Ditto */
 
+  /* token is needed if set(e)uid should be called. It can be set by a call
+     to `set_impersonation_token()'. */
+  HANDLE token;
+  BOOL   impersonated;
+
   cygheap_user () : pname (NULL), plogsrv (NULL), pdomain (NULL), psid (NULL) {}
   ~cygheap_user ();