From 0efafbfb8cfd1fedfb5361c98544545c1c648733 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 10 Sep 2003 21:01:40 +0000 Subject: * shared_info.h (shared_info::initialize): Remove argument. * cygheap.h (cygheap_user::init): New declaration. * uinfo.cc (cygheap_user::init): New. (internal_getlogin): Move functionality to cygheap_user::init. Open the process token to update the group sid. * shared.cc (user_shared_initialize): Get the user information from cygheap->user. (shared_info::initialize): Remove argument. Call cygheap->user.init instead of cygheap->user.set_name. (memory_init): Do not get the user name and do not pass it to shared_info::initialize. * registry.cc (get_registry_hive_path): Make csid a cygpsid. (load_registry_hive): Ditto. --- winsup/cygwin/registry.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/registry.cc') diff --git a/winsup/cygwin/registry.cc b/winsup/cygwin/registry.cc index 22fa511a7..d1443eee7 100644 --- a/winsup/cygwin/registry.cc +++ b/winsup/cygwin/registry.cc @@ -202,7 +202,7 @@ get_registry_hive_path (const PSID psid, char *path) if (!psid || !path) return NULL; - cygsid csid (psid); + cygpsid csid (psid); csid.string (sid); strcpy (key,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); strcat (key, sid); @@ -233,7 +233,7 @@ load_registry_hive (PSID psid) if (!psid) return; /* Check if user hive is already loaded. */ - cygsid csid (psid); + cygpsid csid (psid); csid.string (sid); if (!RegOpenKeyExA (HKEY_USERS, sid, 0, KEY_READ, &hkey)) { -- cgit v1.2.3