From ba94682838272afc87b73833c02aaf6cea40815e Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 12 Sep 2001 17:46:37 +0000 Subject: * Makefile.in: Build wincap.o. * wincap.cc: New file. * wincap.h: Ditto. * autoload.cc: Add dynamic load statement for `CreateHardLinkA'. * dcrt0.cc (os_being_run): Eliminated. (osname): Ditto. (iswinnt): Ditto. (set_os_type): Ditto. (dll_crt0_1): Call wincap.init() instead of set_os_type(). (_dll_crt0): Ditto. * environ.cc (set_chunksize): New function. (parse_thing): `forkchunk' setting now invokes function `set_chunksize'. * fork.cc (chunksize): Eliminated. Moved to be member of wincap. * host_dependent.h: Removed. * syscalls.cc (_link): Try using `CreateHardLinkA' first, if available. * cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc, environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc, fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h, security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc, times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap capability check throughout. * winsup.h: Include wincap.h. Eliminate extern declarations of `os_being_run' and `iswinnt'. Eliminate `os_type" definition. * include/cygwin/version.h: Bump version to 1.3.4. --- winsup/cygwin/security.cc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'winsup/cygwin/security.cc') diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 654100cbf..d4dd03c70 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -108,7 +108,7 @@ extern "C" HANDLE cygwin_logon_user (const struct passwd *pw, const char *password) { - if (!iswinnt) + if (!wincap.has_security ()) { set_errno (ENOSYS); return INVALID_HANDLE_VALUE; @@ -1063,7 +1063,7 @@ static int get_nt_attribute (const char *file, int *attribute, uid_t *uidret, gid_t *gidret) { - if (!iswinnt) + if (!wincap.has_security ()) return 0; syscall_printf ("file: %s", file); @@ -1286,7 +1286,7 @@ alloc_sd (uid_t uid, gid_t gid, const char *logsrv, int attribute, { BOOL dummy; - if (!iswinnt) + if (!wincap.has_security ()) return NULL; if (!sd_ret || !sd_size_ret) @@ -1334,13 +1334,7 @@ alloc_sd (uid_t uid, gid_t gid, const char *logsrv, int attribute, * This flag as well as the SetSecurityDescriptorControl call are available * only since Win2K. */ - static int win2KorHigher = -1; - if (win2KorHigher == -1) - { - DWORD version = GetVersion (); - win2KorHigher = (version & 0x80000000) || (version & 0xff) < 5 ? 0 : 1; - } - if (win2KorHigher > 0) + if (wincap.has_security_descriptor_control ()) SetSecurityDescriptorControl (&sd, SE_DACL_PROTECTED, SE_DACL_PROTECTED); /* Create owner for local security descriptor. */ @@ -1559,7 +1553,7 @@ static int set_nt_attribute (const char *file, uid_t uid, gid_t gid, const char *logsrv, int attribute) { - if (!iswinnt) + if (!wincap.has_security ()) return 0; DWORD sd_size = 4096; -- cgit v1.2.3