libgpo: remove some unnecessary usage of ADS_STATUS.

Use NTSTATUS instead.

Guenther

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

diff --git a/libgpo/gpo.h b/libgpo/gpo.h
index 72213b81d0b5b08359a6c0064623b4279360671c..40ecd34b6e95f03f4f5417684b30d8f55de6ac20 100644 (file)
--- a/libgpo/gpo.h
+++ b/libgpo/gpo.h
@@ -237,17 +237,17 @@ void dump_gpo_list(ADS_STRUCT *ads,
                   struct GROUP_POLICY_OBJECT *gpo_list,
                   int debuglevel);
 void dump_gplink(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct GP_LINK *gp_link);
-ADS_STATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
-                            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(TALLOC_CTX *mem_ctx,
-                               const struct security_token *token,
-                               struct GROUP_POLICY_OBJECT *gpo_list,
-                               const char *extensions_guid_filter,
-                               uint32_t flags);
+NTSTATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
+                          const struct security_token *token,
+                          struct registry_key *root_key,
+                          struct GROUP_POLICY_OBJECT *gpo,
+                          const char *extension_guid_filter,
+                          uint32_t flags);
+NTSTATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
+                             const struct security_token *token,
+                             struct GROUP_POLICY_OBJECT *gpo_list,
+                             const char *extensions_guid_filter,
+                             uint32_t flags);
 NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,
                            const char *cache_dir,

diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index ea08f58f84bdb2e50f1c1020806efdaea880af39..7378cfcd6e689e54bb701c79a1db4670253239d4 100644 (file)
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -443,12 +443,12 @@ static bool gpo_get_gp_ext_from_gpo(TALLOC_CTX *mem_ctx,
 /****************************************************************
 ****************************************************************/
 
-ADS_STATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
-                            const struct security_token *token,
-                            struct registry_key *root_key,
-                            struct GROUP_POLICY_OBJECT *gpo,
-                            const char *extension_guid_filter,
-                            uint32_t flags)
+NTSTATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
+                          const struct security_token *token,
+                          struct registry_key *root_key,
+                          struct GROUP_POLICY_OBJECT *gpo,
+                          const char *extension_guid_filter,
+                          uint32_t flags)
 {
        struct GP_EXT *gp_ext = NULL;
        int i;
@@ -462,7 +462,7 @@ ADS_STATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
        }
 
        if (!gpo_get_gp_ext_from_gpo(mem_ctx, flags, gpo, &gp_ext)) {
-               return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
        if (!gp_ext || !gp_ext->num_exts) {
@@ -471,7 +471,7 @@ ADS_STATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
                                "no policies in %s (%s) for this extension\n",
                                gpo->name, gpo->display_name));
                }
-               return ADS_SUCCESS;
+               return NT_STATUS_OK;
        }
 
        for (i=0; i<gp_ext->num_exts; i++) {
@@ -489,24 +489,24 @@ ADS_STATUS gpo_process_a_gpo(TALLOC_CTX *mem_ctx,
                                                   gp_ext->extensions_guid[i],
                                                   gp_ext->snapins_guid[i]);
                if (!NT_STATUS_IS_OK(ntstatus)) {
-                       ADS_ERROR_NT(ntstatus);
+                       return ntstatus;
                }
        }
 
-       return ADS_SUCCESS;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************
 ****************************************************************/
 
-static ADS_STATUS gpo_process_gpo_list_by_ext(TALLOC_CTX *mem_ctx,
-                                             const struct security_token *token,
-                                             struct registry_key *root_key,
-                                             struct GROUP_POLICY_OBJECT *gpo_list,
-                                             const char *extensions_guid,
-                                             uint32_t flags)
+static NTSTATUS gpo_process_gpo_list_by_ext(TALLOC_CTX *mem_ctx,
+                                           const struct security_token *token,
+                                           struct registry_key *root_key,
+                                           struct GROUP_POLICY_OBJECT *gpo_list,
+                                           const char *extensions_guid,
+                                           uint32_t flags)
 {
-       ADS_STATUS status;
+       NTSTATUS status;
        struct GROUP_POLICY_OBJECT *gpo;
 
        for (gpo = gpo_list; gpo; gpo = gpo->next) {
@@ -523,40 +523,40 @@ static ADS_STATUS gpo_process_gpo_list_by_ext(TALLOC_CTX *mem_ctx,
                status = gpo_process_a_gpo(mem_ctx, token, root_key,
                                           gpo, extensions_guid, flags);
 
-               if (!ADS_ERR_OK(status)) {
+               if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0,("failed to process gpo by ext: %s\n",
-                               ads_errstr(status)));
+                               nt_errstr(status)));
                        return status;
                }
        }
 
-       return ADS_SUCCESS;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************
 ****************************************************************/
 
-ADS_STATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
-                               const struct security_token *token,
-                               struct GROUP_POLICY_OBJECT *gpo_list,
-                               const char *extensions_guid_filter,
-                               uint32_t flags)
+NTSTATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
+                             const struct security_token *token,
+                             struct GROUP_POLICY_OBJECT *gpo_list,
+                             const char *extensions_guid_filter,
+                             uint32_t flags)
 {
-       ADS_STATUS status = ADS_SUCCESS;
+       NTSTATUS status = NT_STATUS_OK;
        struct gp_extension *gp_ext_list = NULL;
        struct gp_extension *gp_ext = NULL;
        struct registry_key *root_key = NULL;
        struct gp_registry_context *reg_ctx = NULL;
        WERROR werr;
 
-       status = ADS_ERROR_NT(init_gp_extensions(mem_ctx));
-       if (!ADS_ERR_OK(status)) {
+       status = init_gp_extensions(mem_ctx);
+       if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
        gp_ext_list = get_gp_extension_list();
        if (!gp_ext_list) {
-               return ADS_ERROR_NT(NT_STATUS_DLL_INIT_FAILED);
+               return NT_STATUS_DLL_INIT_FAILED;
        }
 
        /* get the key here */
@@ -571,7 +571,7 @@ ADS_STATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
        }
        if (!W_ERROR_IS_OK(werr)) {
                talloc_free(reg_ctx);
-               return ADS_ERROR_NT(werror_to_ntstatus(werr));
+               return werror_to_ntstatus(werr);
        }
 
        root_key = reg_ctx->curr_key;
@@ -582,7 +582,7 @@ ADS_STATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
 
                guid_str = GUID_string(mem_ctx, gp_ext->guid);
                if (!guid_str) {
-                       status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                       status = NT_STATUS_NO_MEMORY;
                        goto done;
                }
 
@@ -599,7 +599,7 @@ ADS_STATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
                status = gpo_process_gpo_list_by_ext(mem_ctx, token,
                                                     root_key, gpo_list,
                                                     guid_str, flags);
-               if (!ADS_ERR_OK(status)) {
+               if (!NT_STATUS_IS_OK(status)) {
                        goto done;
                }
        }

diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 891ecd620a08b853aa5edfec75dc61c2cdfc4348..0a698da0d041f15a9f3a0b37eb5b48bb38f35cff 100644 (file)
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -433,8 +433,8 @@ static int net_ads_gpo_apply(struct net_context *c, int argc, const char **argv)
                goto out;
        }
 
-       status = gpo_process_gpo_list(mem_ctx, token, gpo_list,
-                                     filter, flags);
+       status = ADS_ERROR_NT(gpo_process_gpo_list(mem_ctx, token, gpo_list,
+                                                  filter, flags));
        if (!ADS_ERR_OK(status)) {
                d_printf("failed to process gpo list: %s\n",
                        ads_errstr(status));