Don't load ldap library dynamically, link it!

Change-Id: I5e9aeb3ebda0c30da364df0d7a1c0f245a33431c

1 files changed, 1 insertions, 34 deletions

diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index dd7bb2cd9506..3cf290738b00 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -40,20 +40,6 @@ namespace ldap = css::ldap ;
 //------------------------------------------------------------------------------
 struct LdapUserProfile;
 
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_unbind_s)( LDAP *ld );
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_simple_bind_s)( LDAP *ld, const char *who, const char *passwd );
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_set_option)( LDAP *ld, int option, const void *optdata );
-typedef LDAP_API(char *) (LDAP_CALL *t_ldap_err2string)( int err );
-typedef LDAP_API(LDAP *) (LDAP_CALL *t_ldap_init)( const char *defhost, int defport );
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_msgfree)( LDAPMessage *lm );
-typedef LDAP_API(char *) (LDAP_CALL *t_ldap_get_dn)( LDAP *ld, LDAPMessage *entry );
-typedef LDAP_API(LDAPMessage *) (LDAP_CALL *t_ldap_first_entry)( LDAP *ld,  LDAPMessage *chain );
-typedef LDAP_API(char *) (LDAP_CALL *t_ldap_first_attribute)( LDAP *ld, LDAPMessage *entry, void **ptr );
-typedef LDAP_API(char *) (LDAP_CALL *t_ldap_next_attribute)( LDAP *ld, LDAPMessage *entry, void *ptr );
-typedef LDAP_API(int) (LDAP_CALL *t_ldap_search_s)( LDAP *ld, const char *base, int scope,  const char *filter, char **attrs, int attrsonly, LDAPMessage **res );
-typedef LDAP_API(void) (LDAP_CALL *t_ldap_value_free)( char **vals );
-typedef LDAP_API(char **) (LDAP_CALL *t_ldap_get_values)( LDAP *ld, LDAPMessage *entry, const char *target );
-typedef LDAP_API(void) (LDAP_CALL *t_ldap_memfree)( void *p );
 //------------------------------------------------------------------------------
 /** Struct containing the information on LDAP connection */
 struct LdapDefinition
@@ -113,9 +99,6 @@ public:
                 ldap::LdapConnectionException,
                 ldap::LdapGenericException);
 
-    void loadModule();
-
-    static t_ldap_err2string        s_p_err2string;
 private:
 
     void initConnection()
@@ -134,24 +117,8 @@ private:
     /** LDAP connection object */
     LDAP* mConnection ;
     LdapDefinition mLdapDefinition;
-
-    static oslModule                s_Ldap_Module;
-    static t_ldap_value_free        s_p_value_free;
-    static t_ldap_get_values        s_p_get_values;
-    static t_ldap_unbind_s          s_p_unbind_s;
-    static t_ldap_simple_bind_s     s_p_simple_bind_s;
-    static t_ldap_set_option        s_p_set_option;
-    static t_ldap_init              s_p_init;
-    static t_ldap_msgfree           s_p_msgfree;
-    static t_ldap_get_dn            s_p_get_dn;
-    static t_ldap_first_entry       s_p_first_entry;
-    static t_ldap_first_attribute   s_p_first_attribute;
-    static t_ldap_next_attribute    s_p_next_attribute;
-    static t_ldap_search_s          s_p_search_s;
-
-    static t_ldap_memfree           s_p_memfree;
-
 } ;
+
 //------------------------------------------------------------------------------
 }} }