Reverted latest changes.

[reactos.git] / reactos / lib / ntdll / rtl / sd.c

diff --git a/reactos/lib/ntdll/rtl/sd.c b/reactos/lib/ntdll/rtl/sd.c
index 0bb546d..a4b0d65 100644 (file)
--- a/reactos/lib/ntdll/rtl/sd.c
+++ b/reactos/lib/ntdll/rtl/sd.c
@@ -1,4 +1,4 @@
-/* $Id: sd.c,v 1.8 2002/09/07 15:12:40 chorns Exp $
+/* $Id: sd.c,v 1.9 2002/09/08 10:23:06 chorns Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -11,11 +11,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NTOS_USER_MODE
-#include <ntos.h>
+#include <ddk/ntddk.h>
 
-#define NDEBUG
-#include <debug.h>
+#include <ntdll/ntdll.h>
 
 /* FUNCTIONS ***************************************************************/
 
@@ -42,8 +40,8 @@ RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor,
 ULONG STDCALL
 RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor)
 {
-  PISID Owner;
-  PISID Group;
+  PSID Owner;
+  PSID Group;
   ULONG Length;
   PACL Dacl;
   PACL Sacl;
@@ -52,10 +50,10 @@ RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor)
 
   if (SecurityDescriptor->Owner != NULL)
     {
-       Owner = (PISID)SecurityDescriptor->Owner;
+       Owner = SecurityDescriptor->Owner;
        if (SecurityDescriptor->Control & SE_SELF_RELATIVE)
          {
-            Owner = (PISID)((ULONG)Owner + 
+            Owner = (PSID)((ULONG)Owner + 
                            (ULONG)SecurityDescriptor);
          }
        Length = Length + ((sizeof(SID) + (Owner->SubAuthorityCount - 1) * 
@@ -67,7 +65,7 @@ RtlLengthSecurityDescriptor(PSECURITY_DESCRIPTOR SecurityDescriptor)
        Group = SecurityDescriptor->Group;
        if (SecurityDescriptor->Control & SE_SELF_RELATIVE)
          {
-            Group = (PISID)((ULONG)Group + (ULONG)SecurityDescriptor);
+            Group = (PSID)((ULONG)Group + (ULONG)SecurityDescriptor);
          }
        Length = Length + ((sizeof(SID) + (Group->SubAuthorityCount - 1) *
                           sizeof(ULONG) + 3) & 0xfc);