From f32b9a15950fd37aed5dae2ccf0a1e60a0fc78ee Mon Sep 17 00:00:00 2001
From: Arthur de Jong <arthur@arthurdejong.org>
Date: Fri, 7 Sep 2007 08:41:44 +0000
Subject: move some of the filter code to the database specific modules to be
 able to reduce complexity of ldap-nss.c later on

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@375 ef36b2f9-881f-0410-afb5-c4e39611909c
---
 nslcd/ldap-nss.h | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

(limited to 'nslcd/ldap-nss.h')

diff --git a/nslcd/ldap-nss.h b/nslcd/ldap-nss.h
index d318062..85f1b59 100644
--- a/nslcd/ldap-nss.h
+++ b/nslcd/ldap-nss.h
@@ -233,19 +233,15 @@ char *_nss_ldap_next_attribute (LDAPMessage * entry, BerElement *ber);
 /*
  * Synchronous search cover (caller acquires lock).
  */
-enum nss_status _nss_ldap_search_s (const struct ldap_args * args,   /* IN */
-                               const char *filterprot,  /* IN */
-                               enum ldap_map_selector sel, /* IN */
-                               const char **attrs, /* IN */
-                               int sizelimit,   /* IN */
-                               LDAPMessage ** res /* OUT */ );
-
+enum nss_status _nss_ldap_search_s(
+        const char *base,const char *filter,
+        enum ldap_map_selector sel,
+        const char **attrs,int sizelimit,LDAPMessage **res);
 
 int _nss_ldap_searchbyname(
-        struct ldap_args *args,const char *filterprot,
+        const char *base,const char *filter,
         enum ldap_map_selector sel,const char **attrs,TFILE *fp,NEWparser_t parser);
 
-
 /*
  * Emulate X.500 read operation.
  */
@@ -285,16 +281,11 @@ enum nss_status _nss_ldap_getent (struct ent_context ** ctx, /* IN/OUT */
 /*
  * common lookup routine; uses synchronous API.
  */
-enum nss_status _nss_ldap_getbyname (struct ldap_args * args,        /* IN/OUT */
-                                void *result,   /* IN/OUT */
-                                char *buffer,   /* IN */
-                                size_t buflen,  /* IN */
-                                int *errnop,    /* OUT */
-                                const char *filterprot, /* IN */
-                                enum ldap_map_selector sel,        /* IN */
-                                const char **attrs, /* IN */
-                                parser_t parser /* IN */ );
-
+int _nss_ldap_getbyname(void *result, char *buffer, size_t buflen,
+                        int *errnop, enum ldap_map_selector sel,
+                        const char *base, const char *filter,
+                        const char **attrs,
+                        parser_t parser);
 
 /* parsing utility functions */
 enum nss_status _nss_ldap_assign_attrvals (LDAPMessage * e,     /* IN */
-- 
cgit v1.2.3