From b6276ca48b1a1661bce5710b002585120bd74ded Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 19 Mar 2014 16:14:38 -0600 Subject: [PATCH 1/2] Ticket #47680 Upgraded 389-admin rpms and now I can't start dirsrv-admin https://fedorahosted.org/389/ticket/47680 Reviewed by: ??? Branch: master Fix Description: Get rid of bogus function admldap_ldap_explode. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no --- include/libadminutil/admutil-int.h | 1 - lib/libadminutil/admutil.c | 10 ---------- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/include/libadminutil/admutil-int.h b/include/libadminutil/admutil-int.h index 8048b6d..20992e2 100644 --- a/include/libadminutil/admutil-int.h +++ b/include/libadminutil/admutil-int.h @@ -187,7 +187,6 @@ int admutil_ldap_bind( int *msgidp /* pass in non-NULL for async handling */ ); -char **admldap_ldap_explode( const char *dn, const int notypes, const int nametype ); char **admldap_ldap_explode_dn( const char *dn, const int notypes ); char **admldap_ldap_explode_rdn( const char *rdn, const int notypes ); #endif /* __ADMUTIL_INT_H__ */ diff --git a/lib/libadminutil/admutil.c b/lib/libadminutil/admutil.c index f296b1f..839ab2d 100644 --- a/lib/libadminutil/admutil.c +++ b/lib/libadminutil/admutil.c @@ -2829,16 +2829,6 @@ mozldap_ldap_explode_rdn( const char *rdn, const int notypes ) #endif /* USE_OPENLDAP */ char ** -admldap_ldap_explode( const char *dn, const int notypes, const int nametype ) -{ -#if defined(USE_OPENLDAP) - return mozldap_ldap_explode(dn, notypes, nametype); -#else - return ldap_explode(dn, notypes, nametype); -#endif -} - -char ** admldap_ldap_explode_dn( const char *dn, const int notypes ) { #if defined(USE_OPENLDAP) -- 1.7.1