>From e122715014dd1fb4285ba135ed6d4c95778aad9c Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Wed, 21 Jan 2015 17:24:52 +0100 Subject: [PATCH 1/2] LDAP: Rename the _res output parameter to avoid clashing with libresolv in tests --- src/providers/ldap/sdap.c | 6 +++--- src/providers/ldap/sdap.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c index e428d5f4b112fe81c6f04ee1746fba0aa2bc10e5..c401e7dc86ded8b3685862c6528034b5cc55068d 100644 --- a/src/providers/ldap/sdap.c +++ b/src/providers/ldap/sdap.c @@ -556,7 +556,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, struct sdap_attr_map_info *minfo, size_t num_maps, LDAPDerefRes *dref, - struct sdap_deref_attrs ***_res) + struct sdap_deref_attrs ***_deref_res) { TALLOC_CTX *tmp_ctx; LDAPDerefVal *dval; @@ -604,7 +604,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, DEBUG(SSSDBG_FUNC_DATA, "Dereferenced entry [%s] has no attributes, skipping\n", orig_dn); - *_res = NULL; + *_deref_res = NULL; ret = EOK; goto done; } @@ -709,7 +709,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, } - *_res = talloc_steal(mem_ctx, res); + *_deref_res = talloc_steal(mem_ctx, res); ret = EOK; done: talloc_zfree(tmp_ctx); diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h index 921051b41a911a2d1117672a8e9c2697b679f24e..d7f6c646e59a8af8347e39afb644d8ea40b9a4c3 100644 --- a/src/providers/ldap/sdap.h +++ b/src/providers/ldap/sdap.h @@ -504,7 +504,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, struct sdap_attr_map_info *minfo, size_t num_maps, LDAPDerefRes *dref, - struct sdap_deref_attrs ***_res); + struct sdap_deref_attrs ***_deref_res); errno_t setup_tls_config(struct dp_option *basic_opts); -- 2.1.0