Changeset 745 for trunk/server/libgpo/gpo_util.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• libgpo/gpo_util.c (modified) (6 diffs)

trunk/server/libgpo/gpo_util.c

@@ -19 +19 @@
 #define TALLOC_DEPRECATED 1
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "../librpc/gen_ndr/ndr_security.h"
+#include "../libgpo/gpo.h"
+#include "../libcli/security/security.h"
 #if _SAMBA_BUILD_ == 4
-#include "system/filesys.h"
 #include "auth/auth.h"
-#include "../libgpo/gpo.h"
-#include "../lib/talloc/talloc.h"
+#include <talloc.h>
 #include "source4/libgpo/ads_convenience.h"
 #endif
@@ -322 +324 @@
                 dump_gp_ext(gp_ext, lvl);
         }
-
-        DEBUGADD(lvl,("security descriptor:\n"));
-
-        NDR_PRINT_DEBUG(security_descriptor, gpo->security_descriptor);
+        if (gpo->security_descriptor) {
+                DEBUGADD(lvl,("security descriptor:\n"));
+
+                NDR_PRINT_DEBUG(security_descriptor, gpo->security_descriptor);
+        }
 }
 
@@ -447 +450 @@
 ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads,
                              TALLOC_CTX *mem_ctx,
-                             const NT_USER_TOKEN *token,
+                             const struct security_token *token,
                              struct registry_key *root_key,
                              struct GROUP_POLICY_OBJECT *gpo,
@@ -504 +507 @@
 static ADS_STATUS gpo_process_gpo_list_by_ext(ADS_STRUCT *ads,
                                               TALLOC_CTX *mem_ctx,
-                                              const NT_USER_TOKEN *token,
+                                              const struct security_token *token,
                                               struct registry_key *root_key,
                                               struct GROUP_POLICY_OBJECT *gpo_list,
@@ -542 +545 @@
 ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
                                 TALLOC_CTX *mem_ctx,
-                                const NT_USER_TOKEN *token,
+                                const struct security_token *token,
                                 struct GROUP_POLICY_OBJECT *gpo_list,
                                 const char *extensions_guid_filter,
@@ -839 +842 @@
                                 struct loadparm_context *lp_ctx,
                                 const char *dn,
-                                NT_USER_TOKEN **token)
-{
-        NT_USER_TOKEN *ad_token = NULL;
+                                struct security_token **token)
+{
+        struct security_token *ad_token = NULL;
         ADS_STATUS status;
 #if _SAMBA_BUILD_ == 4