From aa2b85cc90a41b143a62196af77736bad9b2da70 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 20 Dec 2000 12:42:43 +0000
Subject: [PATCH]         * autoload.cc: Add load statemant for
 SetSecurityDescriptorControl.         * security.cc (alloc_sd): Always set
 SE_DACL_PROTECTED flag on         Win2K and higher.

---
 winsup/cygwin/ChangeLog   |  6 ++++++
 winsup/cygwin/autoload.cc |  1 +
 winsup/cygwin/security.cc | 15 +++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index aeeec0092..b5795c679 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 20 13:37:00 2000  Corinna Vinschen <corinna@vinschen.de>
+
+	* autoload.cc: Add load statemant for SetSecurityDescriptorControl.
+	* security.cc (alloc_sd): Always set SE_DACL_PROTECTED flag on
+	Win2K and higher.
+
 Wed Dec 20 01:02:13 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* exceptions.cc (reset_signal_arrived): Make global to avoid inlining.
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
index 77c37249e..83081b73c 100644
--- a/winsup/cygwin/autoload.cc
+++ b/winsup/cygwin/autoload.cc
@@ -228,6 +228,7 @@ LoadDLLfunc (RegisterEventSourceA, 8, advapi32)
 LoadDLLfunc (ReportEventA, 36, advapi32)
 LoadDLLfunc (RevertToSelf, 0, advapi32)
 LoadDLLfunc (SetKernelObjectSecurity, 12, advapi32)
+LoadDLLfunc (SetSecurityDescriptorControl, 12, advapi32)
 LoadDLLfunc (SetSecurityDescriptorDacl, 16, advapi32)
 LoadDLLfunc (SetSecurityDescriptorGroup, 12, advapi32)
 LoadDLLfunc (SetSecurityDescriptorOwner, 12, advapi32)
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 67caf689e..f5cb8138f 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -915,6 +915,21 @@ alloc_sd (uid_t uid, gid_t gid, const char *logsrv, int attribute,
       return NULL;
     }
 
+  /*
+   * We set the SE_DACL_PROTECTED flag here to prevent the DACL from being modified
+   * by inheritable ACEs.
+   * 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)
+    SetSecurityDescriptorControl (&sd, SE_DACL_PROTECTED, SE_DACL_PROTECTED);
+
   /* Create owner for local security descriptor. */
   if (! SetSecurityDescriptorOwner(&sd, owner_sid, FALSE))
     {