diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-10-23 23:16:53 +0200 |
|---|---|---|
| committer | Lukas Slebodnik <lslebodn@redhat.com> | 2015-11-11 08:35:58 +0100 |
| commit | a3ade2e98d397d000f224ae80c6512c959cca18e (patch) | |
| tree | 3066d27f7c1cfbad608fdaf4b512bf1da423586f | |
| parent | 46ef3da071401904a8c4930df4f2b1103c309c25 (diff) | |
| download | sssd-a3ade2e98d397d000f224ae80c6512c959cca18e.tar.gz sssd-a3ade2e98d397d000f224ae80c6512c959cca18e.tar.xz sssd-a3ade2e98d397d000f224ae80c6512c959cca18e.zip | |
AD: Remove unused memory context from ad_user_conn_list
Reviewed-by: Petr Cech <pcech@redhat.com>
| -rw-r--r-- | src/providers/ad/ad_common.c | 3 | ||||
| -rw-r--r-- | src/providers/ad/ad_common.h | 3 | ||||
| -rw-r--r-- | src/providers/ad/ad_id.c | 2 | ||||
| -rw-r--r-- | src/tests/cmocka/test_ad_common.c | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c index ffc135124..665e6ec4c 100644 --- a/src/providers/ad/ad_common.c +++ b/src/providers/ad/ad_common.c @@ -1289,8 +1289,7 @@ ad_ldap_conn_list(TALLOC_CTX *mem_ctx, } struct sdap_id_conn_ctx ** -ad_user_conn_list(TALLOC_CTX *mem_ctx, - struct ad_id_ctx *ad_ctx, +ad_user_conn_list(struct ad_id_ctx *ad_ctx, struct sss_domain_info *dom) { struct sdap_id_conn_ctx **clist; diff --git a/src/providers/ad/ad_common.h b/src/providers/ad/ad_common.h index 0cefa1859..de6ffbff7 100644 --- a/src/providers/ad/ad_common.h +++ b/src/providers/ad/ad_common.h @@ -154,8 +154,7 @@ ad_ldap_conn_list(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom); struct sdap_id_conn_ctx ** -ad_user_conn_list(TALLOC_CTX *mem_ctx, - struct ad_id_ctx *ad_ctx, +ad_user_conn_list(struct ad_id_ctx *ad_ctx, struct sss_domain_info *dom); struct sdap_id_conn_ctx * diff --git a/src/providers/ad/ad_id.c b/src/providers/ad/ad_id.c index 51d378863..b39fda6dc 100644 --- a/src/providers/ad/ad_id.c +++ b/src/providers/ad/ad_id.c @@ -247,7 +247,7 @@ get_conn_list(struct be_req *breq, struct ad_id_ctx *ad_ctx, switch (ar->entry_type & BE_REQ_TYPE_MASK) { case BE_REQ_USER: /* user */ - clist = ad_user_conn_list(breq, ad_ctx, dom); + clist = ad_user_conn_list(ad_ctx, dom); break; case BE_REQ_BY_SECID: /* by SID */ case BE_REQ_USER_AND_GROUP: /* get SID */ diff --git a/src/tests/cmocka/test_ad_common.c b/src/tests/cmocka/test_ad_common.c index b0cf4b5e6..b1929ae35 100644 --- a/src/tests/cmocka/test_ad_common.c +++ b/src/tests/cmocka/test_ad_common.c @@ -454,8 +454,7 @@ void test_user_conn_list(void **state) struct ad_common_test_ctx); assert_non_null(test_ctx); - conn_list = ad_user_conn_list(test_ctx, - test_ctx->ad_ctx, + conn_list = ad_user_conn_list(test_ctx->ad_ctx, test_ctx->dom); assert_non_null(conn_list); @@ -464,8 +463,7 @@ void test_user_conn_list(void **state) assert_null(conn_list[1]); talloc_free(conn_list); - conn_list = ad_user_conn_list(test_ctx, - test_ctx->ad_ctx, + conn_list = ad_user_conn_list(test_ctx->ad_ctx, test_ctx->subdom); assert_non_null(conn_list); |