* cygheap.cc (cygheap_init): Fix formatting. Remove comment. Set
shared_prefix depending only on terminal service capability. * dcrt0.cc (dll_crt0_1): Don't call set_cygwin_privileges here. * fhandler_fifo.cc (fhandler_fifo::open): Create the mutex as global object. * posix_ipc.cc (ipc_mutex_init): Use cygheap->shared_prefix. (ipc_cond_init): Ditto. * sec_helper.cc (privilege_name): Make static. Use LookupPrivilegeName directly to be independent of the state of cygheap. (set_privilege): Take a LUID as parameter instead of an index value. Only print debug output in case of failure. (set_cygwin_privileges): Add comment. Use LookupPrivilegeValue to get privilege LUIDs. (init_global_security): Call set_cygwin_privileges here. * security.h (privilege_name): Drop declaration. (set_privilege): Declare according to above change. (set_process_privilege): Call privilege_luid to get LUID. (_push_thread_privilege): Ditto. * shared.cc (open_shared): Add comment. On systems supporting the SeCreateGlobalPrivilege, try to create/open global shared memory first. Fall back to local shared memory if that fails. * thread.cc (semaphore::semaphore): Use cygheap->shared_prefix. * wincap.h (wincapc::has_create_global_privilege): New element. * wincap.cc: Implement above element throughout.
This commit is contained in:
@ -84,16 +84,43 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
|
||||
m = SH_JUSTOPEN;
|
||||
else
|
||||
{
|
||||
/* Beginning with Windows 2003 Server, a process doesn't necessarily
|
||||
have the right to create globally accessible shared memory. If so,
|
||||
creating the shared memory will fail with ERROR_ACCESS_DENIED if the
|
||||
user doesn't have the SeCreateGlobalPrivilege privilege. If that
|
||||
happened, we retry to create a shared memory object locally. This
|
||||
only allows to see the processes in the current user session, but
|
||||
that's better than nothing. */
|
||||
|
||||
if (name)
|
||||
mapname = shared_name (map_buf, name, n);
|
||||
if (m == SH_JUSTOPEN)
|
||||
shared_h = OpenFileMapping (access, FALSE, mapname);
|
||||
{
|
||||
shared_h = OpenFileMapping (access, FALSE, mapname);
|
||||
if (!shared_h && wincap.has_create_global_privilege ()
|
||||
&& GetLastError () == ERROR_FILE_NOT_FOUND)
|
||||
shared_h = OpenFileMapping (access, FALSE, mapname + 7);
|
||||
}
|
||||
else
|
||||
{
|
||||
shared_h = CreateFileMapping (INVALID_HANDLE_VALUE, psa, PAGE_READWRITE,
|
||||
0, size, mapname);
|
||||
if (GetLastError () == ERROR_ALREADY_EXISTS)
|
||||
m = SH_JUSTOPEN;
|
||||
shared_h = CreateFileMapping (INVALID_HANDLE_VALUE, psa,
|
||||
PAGE_READWRITE, 0, size, mapname);
|
||||
switch (GetLastError ())
|
||||
{
|
||||
case ERROR_ALREADY_EXISTS:
|
||||
m = SH_JUSTOPEN;
|
||||
break;
|
||||
case ERROR_ACCESS_DENIED:
|
||||
if (wincap.has_create_global_privilege ())
|
||||
{
|
||||
shared_h = CreateFileMapping (INVALID_HANDLE_VALUE, psa,
|
||||
PAGE_READWRITE, 0, size,
|
||||
mapname + 7);
|
||||
if (GetLastError () == ERROR_ALREADY_EXISTS)
|
||||
m = SH_JUSTOPEN;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (shared_h)
|
||||
/* ok! */;
|
||||
|
Reference in New Issue
Block a user