ehlo, Memory context memctx was unused in functions _ad_servers_init sdap_ad_tokengroups_update_members.
Patch is attached. LS
>From e6c1bd41a380fa9dcd106061b3a841d00da19f50 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Mon, 27 Jan 2014 14:01:27 +0100 Subject: [PATCH] AD: Remove unused memory contexts Memory context memctx was unused in functions _ad_servers_init sdap_ad_tokengroups_update_members --- src/providers/ad/ad_common.c | 15 +++++++-------- src/providers/ldap/sdap_async_initgroups_ad.c | 7 +++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c index 99fa4c07af2a79bb3ca195214ddb0dbd60c61620..77c2639a75d4107196761029f0436b22bf06a2fb 100644 --- a/src/providers/ad/ad_common.c +++ b/src/providers/ad/ad_common.c @@ -353,8 +353,7 @@ static void ad_resolve_callback(void *private_data, struct fo_server *server); static errno_t -_ad_servers_init(TALLOC_CTX *mem_ctx, - struct ad_service *service, +_ad_servers_init(struct ad_service *service, struct be_ctx *bectx, const char *fo_service, const char *fo_gc_service, @@ -468,22 +467,22 @@ done: } static inline errno_t -ad_primary_servers_init(TALLOC_CTX *mem_ctx, struct ad_service *service, +ad_primary_servers_init(struct ad_service *service, struct be_ctx *bectx, const char *servers, const char *fo_service, const char *fo_gc_service, const char *ad_domain) { - return _ad_servers_init(mem_ctx, service, bectx, fo_service, + return _ad_servers_init(service, bectx, fo_service, fo_gc_service, servers, ad_domain, true); } static inline errno_t -ad_backup_servers_init(TALLOC_CTX *mem_ctx, struct ad_service *service, +ad_backup_servers_init(struct ad_service *service, struct be_ctx *bectx, const char *servers, const char *fo_service, const char *fo_gc_service, const char *ad_domain) { - return _ad_servers_init(mem_ctx, service, bectx, fo_service, + return _ad_servers_init(service, bectx, fo_service, fo_gc_service, servers, ad_domain, false); } @@ -603,7 +602,7 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, primary_servers = BE_SRV_IDENTIFIER; } - ret = ad_primary_servers_init(mem_ctx, service, bectx, + ret = ad_primary_servers_init(service, bectx, primary_servers, ad_service, ad_gc_service, ad_domain); if (ret != EOK) { @@ -611,7 +610,7 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, } if (backup_servers) { - ret = ad_backup_servers_init(mem_ctx, service, bectx, + ret = ad_backup_servers_init(service, bectx, backup_servers, ad_service, ad_gc_service, ad_domain); if (ret != EOK) { diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c index 047ddfe65031502aa92e32024cb5f73bebb9fb3d..52adda3f8533733d191dd68b8f9c8edb1af6e8d3 100644 --- a/src/providers/ldap/sdap_async_initgroups_ad.c +++ b/src/providers/ldap/sdap_async_initgroups_ad.c @@ -474,8 +474,7 @@ static errno_t sdap_get_ad_tokengroups_recv(TALLOC_CTX *mem_ctx, } static errno_t -sdap_ad_tokengroups_update_members(TALLOC_CTX *mem_ctx, - const char *username, +sdap_ad_tokengroups_update_members(const char *username, struct sysdb_ctx *sysdb, struct sss_domain_info *domain, char **ldap_groups) @@ -921,7 +920,7 @@ static void sdap_ad_tokengroups_initgr_mapping_done(struct tevent_req *subreq) groups[num_groups] = NULL; - ret = sdap_ad_tokengroups_update_members(state, state->username, + ret = sdap_ad_tokengroups_update_members(state->username, state->sysdb, state->domain, groups); if (ret != EOK) { @@ -1211,7 +1210,7 @@ sdap_ad_tokengroups_initgr_posix_tg_done(struct tevent_req *subreq) missing_sids[num_missing_sids] = NULL; /* update membership of existing groups */ - ret = sdap_ad_tokengroups_update_members(state, state->username, + ret = sdap_ad_tokengroups_update_members(state->username, state->sysdb, state->domain, valid_groups); if (ret != EOK) { -- 1.8.5.3
_______________________________________________ sssd-devel mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
