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:03:27 +0100 |
| commit | 4d7fe714fe74ad242497b2bdbeb7b4e0bf40141f (patch) | |
| tree | 731909a765f096ccffbc10ce448937ba4cfd9a3e | |
| parent | 866ab45027c83fafb7f7f45d34d3e1e7721b77dc (diff) | |
| download | sssd-4d7fe714fe74ad242497b2bdbeb7b4e0bf40141f.tar.gz sssd-4d7fe714fe74ad242497b2bdbeb7b4e0bf40141f.tar.xz sssd-4d7fe714fe74ad242497b2bdbeb7b4e0bf40141f.zip | |
LDAP: Rename the _res output parameter to avoid clashing with libresolv in tests
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
| -rw-r--r-- | src/providers/ldap/sdap.c | 6 | ||||
| -rw-r--r-- | 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 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); diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h index 921051b41..d7f6c646e 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); |