s4:libcli/rap: call->ndr_push_{param,data} can be talloc childs of 'call'

[kai/samba.git] / libgpo / gpo.h

diff --git a/libgpo/gpo.h b/libgpo/gpo.h
index 6e71e3cff7df8b8573d208a314151d52e7eaabc3..62e9091156e28a07997f0860ff270a6e5fc8cf14 100644 (file)
--- a/libgpo/gpo.h
+++ b/libgpo/gpo.h
@@ -20,11 +20,8 @@
 #ifndef __GPO_H__
 #define __GPO_H__
 
-#if _SAMBA_BUILD_ == 4
-#include "source4/libgpo/ads_convenience.h"
-#else
 struct loadparm_context;
-#endif
+#include "ads.h"
 
 enum GPO_LINK_TYPE {
        GP_LINK_UNKOWN  = 0,
@@ -155,7 +152,7 @@ struct gp_registry_entries {
 };
 
 struct gp_registry_context {
-       const NT_USER_TOKEN *token;
+       const struct security_token *token;
        const char *path;
        struct registry_key *curr_key;
 };
@@ -214,18 +211,18 @@ ADS_STATUS ads_get_gpo(ADS_STRUCT *ads,
 ADS_STATUS ads_get_sid_token(ADS_STRUCT *ads,
                             TALLOC_CTX *mem_ctx,
                             const char *dn,
-                            NT_USER_TOKEN **token);
+                            struct security_token **token);
 ADS_STATUS ads_get_gpo_list(ADS_STRUCT *ads,
                            TALLOC_CTX *mem_ctx,
                            const char *dn,
                            uint32_t flags,
-                           const NT_USER_TOKEN *token,
+                           const struct security_token *token,
                            struct GROUP_POLICY_OBJECT **gpo_list);
 
 /* The following definitions come from libgpo/gpo_sec.c  */
 
 NTSTATUS gpo_apply_security_filtering(const struct GROUP_POLICY_OBJECT *gpo,
-                                     const NT_USER_TOKEN *token);
+                                     const struct security_token *token);
 
 /* The following definitions come from libgpo/gpo_util.c  */
 
@@ -244,14 +241,14 @@ void dump_gpo_list(ADS_STRUCT *ads,
 void dump_gplink(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct GP_LINK *gp_link);
 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,
                             const char *extension_guid_filter,
                             uint32_t flags);
 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,
                                uint32_t flags);
@@ -281,7 +278,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
                                TALLOC_CTX *mem_ctx,
                                struct loadparm_context *lp_ctx,
                                const char *dn,
-                               NT_USER_TOKEN **token);
+                               struct security_token **token);
 
 
 #include "../libgpo/gpext/gpext.h"