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

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index d302bceb9f0429d3583b81bbf7aa36c534a23f7a..b6cc410eec922d44370272952a22417c5e62e143 100644 (file)
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -662,9 +662,9 @@ void debug_gpext_header(int lvl,
        DEBUGADD(lvl,("\tsnapin:        %s (%s)\n", snapin_guid,
                cse_snapin_gpo_guid_string_to_name(snapin_guid)));
 
        DEBUGADD(lvl,("\tsnapin:        %s (%s)\n", snapin_guid,
                cse_snapin_gpo_guid_string_to_name(snapin_guid)));
 

-       flags_str = gpo_flag_str(flags);
+       flags_str = gpo_flag_str(NULL, flags);

        DEBUGADD(lvl,("\tflags:         0x%08x %s\n", flags, flags_str));
        DEBUGADD(lvl,("\tflags:         0x%08x %s\n", flags, flags_str));

-       SAFE_FREE(flags_str);
+       TALLOC_FREE(flags_str);

 }
 
 NTSTATUS process_gpo_list_with_extension(ADS_STRUCT *ads,
 }
 
 NTSTATUS process_gpo_list_with_extension(ADS_STRUCT *ads,

diff --git a/libgpo/gpo.h b/libgpo/gpo.h
index a8b5ad39344c5a9c4d394b1dbde4d3b1ac733feb..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"
 
 #if _SAMBA_BUILD_ == 4
 #include "source4/libgpo/ads_convenience.h"

+#else
+struct loadparm_context;

 #endif
 
 enum GPO_LINK_TYPE {
 #endif
 
 enum GPO_LINK_TYPE {


@@ -169,7 +171,7 @@ struct cli_state;
 /* The following definitions come from libgpo/gpo_fetch.c  */
 
 NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
 /* 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,
                                 const char *file_sys_path,
                                 char **server,
                                 char **service,


@@ -178,7 +180,7 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
 NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
                          ADS_STRUCT *ads,
                          struct loadparm_context *lp_ctx,
 NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
                          ADS_STRUCT *ads,
                          struct loadparm_context *lp_ctx,

-                         const char *cache_path,
+                         const char *cache_dir,

                         struct GROUP_POLICY_OBJECT *gpo);
 NTSTATUS gpo_get_sysvol_gpt_version(TALLOC_CTX *mem_ctx,
                                    const char *unix_path,
                         struct GROUP_POLICY_OBJECT *gpo);
 NTSTATUS gpo_get_sysvol_gpt_version(TALLOC_CTX *mem_ctx,
                                    const char *unix_path,


@@ -255,18 +257,18 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
                                uint32_t flags);
 NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,
                                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);
 NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
                                TALLOC_CTX *mem_ctx,
                            struct loadparm_context *lp_ctx,
                           uint32_t flags,
                           struct GROUP_POLICY_OBJECT *gpo);
 NTSTATUS check_refresh_gpo_list(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_list);
 NTSTATUS gpo_get_unix_path(TALLOC_CTX *mem_ctx,
                                 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_path,
+                           const char *cache_dir,

                           struct GROUP_POLICY_OBJECT *gpo,
                           char **unix_path);
 char *gpo_flag_str(TALLOC_CTX *mem_ctx, uint32_t flags);
                           struct GROUP_POLICY_OBJECT *gpo,
                           char **unix_path);
 char *gpo_flag_str(TALLOC_CTX *mem_ctx, uint32_t flags);

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index b6d50ad852ca9fd5e96182da0bee033cd2d6322a..7e41812789e4d292c7f83637fb6168e0130489e9 100644 (file)
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -37,7 +37,7 @@
 ****************************************************************/
 
 NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
 ****************************************************************/
 
 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,
                                 const char *file_sys_path,
                                 char **server,
                                 char **service,


@@ -73,7 +73,7 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
 
        if ((path = talloc_asprintf(mem_ctx,
                                        "%s/%s",
 
        if ((path = talloc_asprintf(mem_ctx,
                                        "%s/%s",

-                                       cache_path,
+                                       cache_dir,

                                        file_sys_path)) == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
                                        file_sys_path)) == NULL) {
                return NT_STATUS_NO_MEMORY;
        }


@@ -98,21 +98,21 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
 ****************************************************************/
 
 static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
 ****************************************************************/
 
 static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,

-                                        const char *cache_path,
+                                        const char *cache_dir,

                                        const char *unix_path)
 {
        char *current_dir;
        char *tok;
 
                                        const char *unix_path)
 {
        char *current_dir;
        char *tok;
 

-       current_dir = talloc_strdup(mem_ctx, cache_path);
+       current_dir = talloc_strdup(mem_ctx, cache_dir);

        NT_STATUS_HAVE_NO_MEMORY(current_dir);
 
        NT_STATUS_HAVE_NO_MEMORY(current_dir);
 

-       if ((mkdir(cache_path, 0644)) < 0 && errno != EEXIST) {
+       if ((mkdir(cache_dir, 0644)) < 0 && errno != EEXIST) {

                return NT_STATUS_ACCESS_DENIED;
        }
 
        while (next_token_talloc(mem_ctx, &unix_path, &tok, "/")) {
                return NT_STATUS_ACCESS_DENIED;
        }
 
        while (next_token_talloc(mem_ctx, &unix_path, &tok, "/")) {

-               if (strequal(tok, GPO_CACHE_DIR)) {
+               if (strequal(tok, cache_dir)) {

                        break;
                }
        }
                        break;
                }
        }


@@ -151,8 +151,7 @@ static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_
                DEBUG(10,("check_refresh_gpo: "
                                "failed to connect: %s\n",
                                nt_errstr(result)));
                DEBUG(10,("check_refresh_gpo: "
                                "failed to connect: %s\n",
                                nt_errstr(result)));

-                       return result;
-               }
+               return result;

        }
        *(struct cli_state **) ret_cli = cli;
 #else
        }
        *(struct cli_state **) ret_cli = cli;
 #else


@@ -191,7 +190,7 @@ static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_
 NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
                          ADS_STRUCT *ads,
                          struct loadparm_context *lp_ctx,
 NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
                          ADS_STRUCT *ads,
                          struct loadparm_context *lp_ctx,

-                         const char *cache_path,
+                         const char *cache_dir,

                         struct GROUP_POLICY_OBJECT *gpo)
 {
        NTSTATUS result;
                         struct GROUP_POLICY_OBJECT *gpo)
 {
        NTSTATUS result;


@@ -204,7 +203,7 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
 #endif
 
 
 #endif
 
 

-       result = gpo_explode_filesyspath(mem_ctx, cache_path, gpo->file_sys_path,
+       result = gpo_explode_filesyspath(mem_ctx, cache_dir, gpo->file_sys_path,

                                         &server, &service, &nt_path,
                                         &unix_path);
        NT_STATUS_NOT_OK_RETURN(result);
                                         &server, &service, &nt_path,
                                         &unix_path);
        NT_STATUS_NOT_OK_RETURN(result);


@@ -213,7 +212,7 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
        result = gpo_connect_server(ads, lp_ctx, server, service, &cli);
 
 
        result = gpo_connect_server(ads, lp_ctx, server, service, &cli);
 
 

-       result = gpo_prepare_local_store(mem_ctx, cache_path, unix_path);
+       result = gpo_prepare_local_store(mem_ctx, cache_dir, unix_path);

        NT_STATUS_NOT_OK_RETURN(result);
 
        unix_ini_path = talloc_asprintf(mem_ctx, "%s/%s", unix_path, GPT_INI);
        NT_STATUS_NOT_OK_RETURN(result);
 
        unix_ini_path = talloc_asprintf(mem_ctx, "%s/%s", unix_path, GPT_INI);

diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 2dd7c496c829fecdac550c6a334a2815b500be6c..7a23b5cbd37c6ea33024df4ee581779ca0de416e 100644 (file)
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -551,8 +551,9 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
        struct gp_extension *gp_ext = NULL;
        struct registry_key *root_key = NULL;
        struct gp_registry_context *reg_ctx = NULL;
        struct gp_extension *gp_ext = NULL;
        struct registry_key *root_key = NULL;
        struct gp_registry_context *reg_ctx = NULL;

+#if 0

        WERROR werr;
        WERROR werr;

-
+#endif

        status = ADS_ERROR_NT(init_gp_extensions(mem_ctx));
        if (!ADS_ERR_OK(status)) {
                return status;
        status = ADS_ERROR_NT(init_gp_extensions(mem_ctx));
        if (!ADS_ERR_OK(status)) {
                return status;


@@ -574,11 +575,11 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
                                       token,
                                       &reg_ctx);
        }
                                       token,
                                       &reg_ctx);
        }

-#endif

        if (!W_ERROR_IS_OK(werr)) {
                talloc_free(reg_ctx);
                return ADS_ERROR_NT(werror_to_ntstatus(werr));
        }
        if (!W_ERROR_IS_OK(werr)) {
                talloc_free(reg_ctx);
                return ADS_ERROR_NT(werror_to_ntstatus(werr));
        }

+#endif

 
        root_key = reg_ctx->curr_key;
 
 
        root_key = reg_ctx->curr_key;
 


@@ -626,7 +627,7 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
 
 NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,
 
 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 loadparm_context *lp_ctx,
                           uint32_t flags,
                           struct GROUP_POLICY_OBJECT *gpo)


@@ -639,7 +640,7 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
        uint32_t sysvol_gpt_version = 0;
        char *display_name = NULL;
 
        uint32_t sysvol_gpt_version = 0;
        char *display_name = NULL;
 

-       result = gpo_explode_filesyspath(mem_ctx, cache_path, gpo->file_sys_path,
+       result = gpo_explode_filesyspath(mem_ctx, cache_dir, gpo->file_sys_path,

                                         &server, &share, &nt_path, &unix_path);
 
        if (!NT_STATUS_IS_OK(result)) {
                                         &server, &share, &nt_path, &unix_path);
 
        if (!NT_STATUS_IS_OK(result)) {


@@ -667,7 +668,7 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
 
                DEBUG(1,("check_refresh_gpo: need to refresh GPO\n"));
 
 
                DEBUG(1,("check_refresh_gpo: need to refresh GPO\n"));
 

-               result = gpo_fetch_files(mem_ctx, ads, lp_ctx, cache_path, gpo);
+               result = gpo_fetch_files(mem_ctx, ads, lp_ctx, cache_dir, gpo);

                if (!NT_STATUS_IS_OK(result)) {
                        goto out;
                }
                if (!NT_STATUS_IS_OK(result)) {
                        goto out;
                }


@@ -713,7 +714,7 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
 
 NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
                                TALLOC_CTX *mem_ctx,
 
 NTSTATUS check_refresh_gpo_list(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_list)
                                 struct loadparm_context *lp_ctx,
                                uint32_t flags,
                                struct GROUP_POLICY_OBJECT *gpo_list)


@@ -727,7 +728,7 @@ NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
 
        for (gpo = gpo_list; gpo; gpo = gpo->next) {
 
 
        for (gpo = gpo_list; gpo; gpo = gpo->next) {
 

-               result = check_refresh_gpo(ads, mem_ctx, cache_path, lp_ctx, flags, gpo);
+               result = check_refresh_gpo(ads, mem_ctx, cache_dir, lp_ctx, flags, gpo);

                if (!NT_STATUS_IS_OK(result)) {
                        goto out;
                }
                if (!NT_STATUS_IS_OK(result)) {
                        goto out;
                }


@@ -745,12 +746,12 @@ NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
 ****************************************************************/
 
 NTSTATUS gpo_get_unix_path(TALLOC_CTX *mem_ctx,
 ****************************************************************/
 
 NTSTATUS gpo_get_unix_path(TALLOC_CTX *mem_ctx,

-                           const char *cache_path,
+                           const char *cache_dir,

                           struct GROUP_POLICY_OBJECT *gpo,
                           char **unix_path)
 {
        char *server, *share, *nt_path;
                           struct GROUP_POLICY_OBJECT *gpo,
                           char **unix_path)
 {
        char *server, *share, *nt_path;

-       return gpo_explode_filesyspath(mem_ctx, cache_path, gpo->file_sys_path,
+       return gpo_explode_filesyspath(mem_ctx, cache_dir, gpo->file_sys_path,

                                       &server, &share, &nt_path, unix_path);
 }
 
                                       &server, &share, &nt_path, unix_path);
 }
 

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 97ef9176572736d4772727afd4cb26859d3788de..ccb5a6e6fa3302d0328d3bf5b0dd606e6aad463f 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -411,7 +411,7 @@ LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
 
 GPEXT_OBJ = ../libgpo/gpext/gpext.o @GPEXT_STATIC@
 
 
 GPEXT_OBJ = ../libgpo/gpext/gpext.o @GPEXT_STATIC@
 

-LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o ../libgpo/gpo_util.o \
+LIBGPO_OBJ0 = ../libgpo/gpo_ldap.o libgpo/gpo_ini.o ../libgpo/gpo_util.o \

              ../libgpo/gpo_fetch.o libgpo/gpo_filesync.o ../libgpo/gpo_sec.o \
              libgpo/gpo_reg.o \
              $(GPEXT_OBJ)
              ../libgpo/gpo_fetch.o libgpo/gpo_filesync.o ../libgpo/gpo_sec.o \
              libgpo/gpo_reg.o \
              $(GPEXT_OBJ)

diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 910c78d05a0e13a65c4c2bd2636c8028d2b5ba2a..9e41905d797a3cd20592bb2b960ca6ab02c71ecc 100644 (file)
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -73,7 +73,7 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg
 
        d_printf("* fetching token ");
        if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
 
        d_printf("* fetching token ");
        if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {

-               status = gp_get_machine_token(ads, mem_ctx, dn, &token);
+               status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);

        } else {
                status = ads_get_sid_token(ads, mem_ctx, dn, &token);
        }
        } else {
                status = ads_get_sid_token(ads, mem_ctx, dn, &token);
        }


@@ -94,6 +94,8 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg
 
        d_printf("* refreshing Group Policy Data ");
        if (!NT_STATUS_IS_OK(result = check_refresh_gpo_list(ads, mem_ctx,
 
        d_printf("* refreshing Group Policy Data ");
        if (!NT_STATUS_IS_OK(result = check_refresh_gpo_list(ads, mem_ctx,

+                                                            cache_path(GPO_CACHE_DIR),
+                                                            NULL,

                                                             flags,
                                                             gpo_list))) {
                d_printf("failed: %s\n", nt_errstr(result));
                                                             flags,
                                                             gpo_list))) {
                d_printf("failed: %s\n", nt_errstr(result));


@@ -326,7 +328,7 @@ static int net_ads_gpo_list(struct net_context *c, int argc, const char **argv)
                argv[0], dn);
 
        if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
                argv[0], dn);
 
        if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {

-               status = gp_get_machine_token(ads, mem_ctx, dn, &token);
+               status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);

        } else {
                status = ads_get_sid_token(ads, mem_ctx, dn, &token);
        }
        } else {
                status = ads_get_sid_token(ads, mem_ctx, dn, &token);
        }