libgpo: remove unused loadparm_context from functions.

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 62e9091156e28a07997f0860ff270a6e5fc8cf14..6e677c9c4f4fdcaf26b1eb0f6063ed002a0548a6 100644 (file)
--- a/libgpo/gpo.h
+++ b/libgpo/gpo.h
@@ -20,7 +20,6 @@
 #ifndef __GPO_H__
 #define __GPO_H__
 
-struct loadparm_context;
 #include "ads.h"
 
 enum GPO_LINK_TYPE {
@@ -176,7 +175,6 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
                                 char **unix_path);
 NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
                          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,
@@ -255,13 +253,11 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
 NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,
                            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,
                                 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,
@@ -276,7 +272,6 @@ 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,
                                struct security_token **token);
 

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 4e895bf544efbcabe991a492b155d3f93d468387..2d5506917141baa5ccc49e62a62c86f7fb96994b 100644 (file)
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -118,7 +118,7 @@ static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_ctx,
+static NTSTATUS gpo_connect_server(ADS_STRUCT *ads,
                                    const char *server, const char *service, void *ret_cli)
 {
        NTSTATUS result;
@@ -150,7 +150,6 @@ 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,
                          const char *cache_dir,
                         struct GROUP_POLICY_OBJECT *gpo)
 {
@@ -166,10 +165,9 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
        NT_STATUS_NOT_OK_RETURN(result);
 
 
-       result = gpo_connect_server(ads, lp_ctx, server, service, &cli);
+       result = gpo_connect_server(ads, server, service, &cli);
        NT_STATUS_NOT_OK_RETURN(result);
 
-
        result = gpo_prepare_local_store(mem_ctx, cache_dir, unix_path);
        NT_STATUS_NOT_OK_RETURN(result);
 

diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index 803e027cd32cdffc88348d4c3213d1e8546d2d3f..d46c48f8f3e52e7121a5ecd49ea4808eb7d8d142 100644 (file)
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -21,7 +21,6 @@
 #include "libgpo/gpo.h"
 #include "auth.h"
 #include "../libcli/security/security.h"
-#include "lib/param/loadparm.h"
 
 /****************************************************************
  parse the raw extension string into a GP_EXT structure

diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index cfb4512aefc2cf32146cd15242ea3590ca40d6ee..43526eda8938c839c503bae8ccf3480eb6cda286 100644 (file)
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -626,7 +626,6 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
 NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,
                            const char *cache_dir,
-                           struct loadparm_context *lp_ctx,
                           uint32_t flags,
                           struct GROUP_POLICY_OBJECT *gpo)
 {
@@ -666,7 +665,7 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
 
                DEBUG(1,("check_refresh_gpo: need to refresh GPO\n"));
 
-               result = gpo_fetch_files(mem_ctx, ads, lp_ctx, cache_dir, gpo);
+               result = gpo_fetch_files(mem_ctx, ads, cache_dir, gpo);
                if (!NT_STATUS_IS_OK(result)) {
                        goto out;
                }
@@ -713,7 +712,6 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
 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)
 {
@@ -726,7 +724,7 @@ NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
 
        for (gpo = gpo_list; gpo; gpo = gpo->next) {
 
-               result = check_refresh_gpo(ads, mem_ctx, cache_dir, lp_ctx, flags, gpo);
+               result = check_refresh_gpo(ads, mem_ctx, cache_dir, flags, gpo);
                if (!NT_STATUS_IS_OK(result)) {
                        goto out;
                }
@@ -834,7 +832,6 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx,
 
 ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
                                TALLOC_CTX *mem_ctx,
-                               struct loadparm_context *lp_ctx,
                                const char *dn,
                                struct security_token **token)
 {

diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 56451ab11e1c2332680149f5db5e919c36b1e5fe..7c397e68a05f5160824601ebb08214b55afb67aa 100644 (file)
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -78,7 +78,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) {
-               status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
+               status = gp_get_machine_token(ads, mem_ctx, dn, &token);
        } else {
                status = ads_get_sid_token(ads, mem_ctx, dn, &token);
        }
@@ -101,7 +101,6 @@ 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,
                                                             cache_path(GPO_CACHE_DIR),
-                                                            NULL,
                                                             flags,
                                                             gpo_list))) {
                d_printf(_("failed: %s\n"), nt_errstr(result));
@@ -337,7 +336,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) {
-               status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
+               status = gp_get_machine_token(ads, mem_ctx, dn, &token);
        } else {
                status = ads_get_sid_token(ads, mem_ctx, dn, &token);
        }
@@ -420,7 +419,7 @@ static int net_ads_gpo_apply(struct net_context *c, int argc, const char **argv)
                argv[0], dn);
 
        if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
-               status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
+               status = gp_get_machine_token(ads, mem_ctx, dn, &token);
        } else {
                status = ads_get_sid_token(ads, mem_ctx, dn, &token);
        }