Changeset 740 for vendor/current/libgpo/gpo_sec.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/libgpo/gpo_sec.c (modified) (6 diffs)

vendor/current/libgpo/gpo_sec.c

@@ -19 +19 @@
 
 #include "includes.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
+#include "../libgpo/gpo.h"
+#include "auth.h"
+#include "../librpc/ndr/libndr.h"
 #if _SAMBA_BUILD_ == 4
 #include "libgpo/ads_convenience.h"
@@ -25 +28 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "../libcli/security/secace.h"
-#include "../libgpo/gpo.h"
 #endif
 
@@ -102 +104 @@
 
 static NTSTATUS gpo_sd_check_ace_denied_object(const struct security_ace *ace,
-                                               const NT_USER_TOKEN *token)
+                                               const struct security_token *token)
 {
         char *sid_str;
@@ -124 +126 @@
 
 static NTSTATUS gpo_sd_check_ace_allowed_object(const struct security_ace *ace,
-                                                const NT_USER_TOKEN *token)
+                                                const struct security_token *token)
 {
         char *sid_str;
@@ -147 +149 @@
 
 static NTSTATUS gpo_sd_check_ace(const struct security_ace *ace,
-                                 const NT_USER_TOKEN *token)
+                                 const struct security_token *token)
 {
         switch (ace->type) {
@@ -163 +165 @@
 
 NTSTATUS gpo_apply_security_filtering(const struct GROUP_POLICY_OBJECT *gpo,
-                                      const NT_USER_TOKEN *token)
+                                      const struct security_token *token)
 {
         struct security_descriptor *sd = gpo->security_descriptor;