Adjust samba 3 to the new gpo API. Still untested code.

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

diff --git a/libgpo/gpo.h b/libgpo/gpo.h
index ea3d652bcb00bae018e1fcbcb89d4ebcc3b4d31a..6e71e3cff7df8b8573d208a314151d52e7eaabc3 100644 (file)
--- a/libgpo/gpo.h
+++ b/libgpo/gpo.h
@@ -22,6 +22,8 @@
 
 #if _SAMBA_BUILD_ == 4
 #include "source4/libgpo/ads_convenience.h"
+#else
+struct loadparm_context;
 #endif
 
 enum GPO_LINK_TYPE {
@@ -169,15 +171,16 @@ struct cli_state;
 /* The following definitions come from libgpo/gpo_fetch.c  */
 
 NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
-                                 const char *cache_path,
+                                 const char *cache_dir,
                                 const char *file_sys_path,
                                 char **server,
                                 char **service,
                                 char **nt_path,
                                 char **unix_path);
 NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
-                         const char *cache_path,
-                        struct cli_state *cli,
+                         ADS_STRUCT *ads,
+                         struct loadparm_context *lp_ctx,
+                         const char *cache_dir,
                         struct GROUP_POLICY_OBJECT *gpo);
 NTSTATUS gpo_get_sysvol_gpt_version(TALLOC_CTX *mem_ctx,
                                    const char *unix_path,
@@ -254,18 +257,21 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
                                uint32_t flags);
 NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,
-                           const char *cache_path,
+                           const char *cache_dir,
+                           struct loadparm_context *lp_ctx,
                           uint32_t flags,
-                          struct GROUP_POLICY_OBJECT *gpo,
-                          struct cli_state **cli_out);
+                          struct GROUP_POLICY_OBJECT *gpo);
 NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
                                TALLOC_CTX *mem_ctx,
+                                const char *cache_dir,
+                                struct loadparm_context *lp_ctx,
                                uint32_t flags,
                                struct GROUP_POLICY_OBJECT *gpo_list);
 NTSTATUS gpo_get_unix_path(TALLOC_CTX *mem_ctx,
+                           const char *cache_dir,
                           struct GROUP_POLICY_OBJECT *gpo,
                           char **unix_path);
-char *gpo_flag_str(uint32_t flags);
+char *gpo_flag_str(TALLOC_CTX *mem_ctx, uint32_t flags);
 NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx,
                      uint32_t flags,
                      const char *filename,
@@ -273,6 +279,7 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx,
                      const char **filename_out);
 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);