s3-libgpo: move group policy protos to where they belong.

[sfrench/samba-autobuild/.git] / source3 / libgpo / gpext / registry.c

diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index 188a48ab49d292319cd241d1d3739852ca4d8ac7..d7018556d85f1cd2ed7f983d08ca9392e4e27d57 100644 (file)
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -18,6 +18,9 @@
  */
 
 #include "includes.h"
+#include "../libgpo/gpo_ini.h"
+#include "../libgpo/gpo.h"
+#include "libgpo/gpo_proto.h"
 
 #define GP_EXT_NAME "registry"
 
@@ -410,7 +413,7 @@ static NTSTATUS reg_parse_registry(TALLOC_CTX *mem_ctx,
                return status;
        }
 
-       buf = (uint16 *)file_load(real_filename, &n, 0);
+       buf = (uint16 *)file_load(real_filename, &n, 0, NULL);
        if (!buf) {
                TALLOC_FREE(reg_file);
                return NT_STATUS_CANNOT_LOAD_REGISTRY_FILE;
@@ -455,7 +458,7 @@ static NTSTATUS reg_parse_registry(TALLOC_CTX *mem_ctx,
        status = NT_STATUS_OK;
 
  out:
-       SAFE_FREE(buf);
+       TALLOC_FREE(buf);
        prs_mem_free(&ps);
 
        return status;
@@ -502,7 +505,7 @@ static WERROR reg_apply_registry(TALLOC_CTX *mem_ctx,
                                                token, flags);
                if (!W_ERROR_IS_OK(werr)) {
                        DEBUG(0,("failed to apply registry: %s\n",
-                               dos_errstr(werr)));
+                               win_errstr(werr)));
                        goto done;
                }
        }
@@ -534,7 +537,7 @@ static NTSTATUS registry_process_group_policy(ADS_STRUCT *ads,
        debug_gpext_header(0, "registry_process_group_policy", flags, gpo,
                           extension_guid, snapin_guid);
 
-       status = gpo_get_unix_path(mem_ctx, gpo, &unix_path);
+       status = gpo_get_unix_path(mem_ctx, cache_path(GPO_CACHE_DIR), gpo, &unix_path);
        NT_STATUS_NOT_OK_RETURN(status);
 
        status = reg_parse_registry(mem_ctx,
@@ -554,7 +557,7 @@ static NTSTATUS registry_process_group_policy(ADS_STRUCT *ads,
                                  entries, num_entries);
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(0,("failed to apply registry: %s\n",
-                       dos_errstr(werr)));
+                       win_errstr(werr)));
                return werror_to_ntstatus(werr);
        }