diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2015-01-21 17:24:52 +0100 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-02-11 11:07:52 +0100 |
commit | 07d69e93a2d2ba68c2fe67d8fb5de18cf69ba797 (patch) | |
tree | aceea8031e1121fdec3da9c3bd7725407e365be0 /src/providers/ldap/sdap.c | |
parent | e3e6a3f87496667bf6456de8855ff831bf222abb (diff) | |
download | sssd-07d69e93a2d2ba68c2fe67d8fb5de18cf69ba797.tar.gz sssd-07d69e93a2d2ba68c2fe67d8fb5de18cf69ba797.tar.xz sssd-07d69e93a2d2ba68c2fe67d8fb5de18cf69ba797.zip |
LDAP: Rename the _res output parameter to avoid clashing with libresolv in tests
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
(cherry picked from commit 4d7fe714fe74ad242497b2bdbeb7b4e0bf40141f)
Diffstat (limited to 'src/providers/ldap/sdap.c')
-rw-r--r-- | src/providers/ldap/sdap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c index e428d5f4b..c401e7dc8 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); |