diff options
| author | Günther Deschner <gd@samba.org> | 2013-12-13 15:54:42 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2013-12-18 14:48:24 +0100 |
| commit | 172d6cd0d033a63d1b057fcadafca3b9bc7c53db (patch) | |
| tree | 4abcd791d0545dc4535a90b6e11bd6f97a9d4314 | |
| parent | e3be1d118831670b89acb3799c9e3b3f7789fb0f (diff) | |
| download | samba-172d6cd0d033a63d1b057fcadafca3b9bc7c53db.tar.gz | |
libgpo: remove unrequired references to ads_struct.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | libgpo/gpo.h | 6 | ||||
| -rw-r--r-- | libgpo/gpo_util.c | 13 | ||||
| -rw-r--r-- | source3/utils/net_ads_gpo.c | 2 |
3 files changed, 8 insertions, 13 deletions
diff --git a/libgpo/gpo.h b/libgpo/gpo.h index 6e677c9c4f4..72213b81d0b 100644 --- a/libgpo/gpo.h +++ b/libgpo/gpo.h @@ -237,15 +237,13 @@ 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(ADS_STRUCT *ads, - 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); -ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, +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, diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index 5810e35d6fc..ea08f58f84b 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -443,8 +443,7 @@ static bool gpo_get_gp_ext_from_gpo(TALLOC_CTX *mem_ctx, /**************************************************************** ****************************************************************/ -ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads, - 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, @@ -500,8 +499,7 @@ ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads, /**************************************************************** ****************************************************************/ -static ADS_STATUS gpo_process_gpo_list_by_ext(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, +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, @@ -522,7 +520,7 @@ static ADS_STATUS gpo_process_gpo_list_by_ext(ADS_STRUCT *ads, * extension, otherwise we cannot store the e.g. the *list* of * logon-scripts correctly (for more then one GPO) */ - status = gpo_process_a_gpo(ads, mem_ctx, token, root_key, + status = gpo_process_a_gpo(mem_ctx, token, root_key, gpo, extensions_guid, flags); if (!ADS_ERR_OK(status)) { @@ -538,8 +536,7 @@ static ADS_STATUS gpo_process_gpo_list_by_ext(ADS_STRUCT *ads, /**************************************************************** ****************************************************************/ -ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, - TALLOC_CTX *mem_ctx, +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, @@ -599,7 +596,7 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, gp_ext->name, guid_str)); - status = gpo_process_gpo_list_by_ext(ads, mem_ctx, token, + status = gpo_process_gpo_list_by_ext(mem_ctx, token, root_key, gpo_list, guid_str, flags); if (!ADS_ERR_OK(status)) { diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c index 7c397e68a05..891ecd620a0 100644 --- a/source3/utils/net_ads_gpo.c +++ b/source3/utils/net_ads_gpo.c @@ -433,7 +433,7 @@ static int net_ads_gpo_apply(struct net_context *c, int argc, const char **argv) goto out; } - status = gpo_process_gpo_list(ads, mem_ctx, token, gpo_list, + status = 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", |