>From 41eeac5569d9f92e50a4e0b628982cf22577dc4d Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Mon, 7 Jul 2014 21:33:32 +0200 Subject: [PATCH 6/7] SDAP: Remove unused function sdap_get_msg_dn This function was not used since 2009. Unused and untested function would just rot, better to remove it completely. --- src/providers/ldap/sdap.c | 31 ------------------------------- src/providers/ldap/sdap.h | 3 --- 2 files changed, 34 deletions(-) diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c index 4bb701187c385933a167f4f85d77f523808ce994..90cc76017580213b602e004365557e3efefe2f3c 100644 --- a/src/providers/ldap/sdap.c +++ b/src/providers/ldap/sdap.c @@ -686,37 +686,6 @@ done: return ret; } -/* =Get-DN-from-message=================================================== */ - -int sdap_get_msg_dn(TALLOC_CTX *memctx, struct sdap_handle *sh, - struct sdap_msg *sm, char **_dn) -{ - char *str; - int lerrno; - int ret; - - lerrno = 0; - ret = ldap_set_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); - if (ret != LDAP_OPT_SUCCESS) { - DEBUG(SSSDBG_CRIT_FAILURE, "ldap_set_option failed [%s], ignored.\n", - sss_ldap_err2string(ret)); - } - - str = ldap_get_dn(sh->ldap, sm->msg); - if (!str) { - ldap_get_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); - DEBUG(SSSDBG_CRIT_FAILURE, "ldap_get_dn failed: %d(%s)\n", - lerrno, sss_ldap_err2string(lerrno)); - return EIO; - } - - *_dn = talloc_strdup(memctx, str); - ldap_memfree(str); - if (!*_dn) return ENOMEM; - - return EOK; -} - errno_t setup_tls_config(struct dp_option *basic_opts) { int ret; diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h index d5366ad8948619c33e0a5fa3878ef1e1900823ef..87f2131ae6e8eea68e4db81b7de6e70a4c0636a7 100644 --- a/src/providers/ldap/sdap.h +++ b/src/providers/ldap/sdap.h @@ -504,9 +504,6 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, LDAPDerefRes *dref, struct sdap_deref_attrs ***_res); -int sdap_get_msg_dn(TALLOC_CTX *memctx, struct sdap_handle *sh, - struct sdap_msg *sm, char **_dn); - errno_t setup_tls_config(struct dp_option *basic_opts); int sdap_set_rootdse_supported_lists(struct sysdb_attrs *rootdse, -- 1.9.3