integrate basic myldap interface (partially merged from dev-myldap branch)

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@443 ef36b2f9-881f-0410-afb5-c4e39611909c

1 files changed, 1 insertions, 11 deletions

diff --git a/nslcd/ldap-nss.h b/nslcd/ldap-nss.h
index a061177..7039ba7 100644
--- a/nslcd/ldap-nss.h
+++ b/nslcd/ldap-nss.h
@@ -35,6 +35,7 @@
 #include <ldap.h>
 
 #include "cfg.h"
+#include "myldap.h"
 
 #ifdef __GNUC__
 #define alignof(ptr) __alignof__(ptr)
@@ -56,9 +57,6 @@
 #define bytesleft(ptr, blen, TYPE) \
   ( (blen < alignof(TYPE)) ? 0 : (blen - alignof(TYPE) + 1))
 
-/* This a a generic session handle. */
-typedef struct ldap_session MYLDAP_SESSION;
-
 /*
  * the state consists of the desired attribute value or an offset into a list of
  * values for the desired attribute. This is necessary to support services.
@@ -99,9 +97,6 @@ struct ent_context
   struct berval *ec_cookie;          /* cookie for paged searches */
 };
 
-/* create a new session, this does not yet connect to the LDAP server */
-MUST_USE MYLDAP_SESSION *myldap_create_session(void);
-
 /* this a a parser function for LDAP results */
 typedef enum nss_status (*parser_t)(MYLDAP_SESSION *session,LDAPMessage *e,
                                     struct ldap_state *state,void *result,
@@ -181,9 +176,4 @@ enum nss_status _nss_ldap_getrdnvalue(
         MYLDAP_SESSION *session,LDAPMessage *entry,const char *rdntype,
         char **rval,char **buffer,size_t * buflen);
 
-/*
- * Escape '*' in a string for use as a filter
- */
-MUST_USE int myldap_escape(const char *src,char *buffer,size_t buflen);
-
 #endif /* _LDAP_NSS_LDAP_LDAP_NSS_H */