first round of cleanups, all non-glibc NSS stuff has been removed, because we are going to do some major restructuring it will not likely remain valid anyway and we can always re-add it later

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

1 files changed, 3 insertions, 140 deletions

diff --git a/ldap-parse.h b/ldap-parse.h
index 1234616..083e9c7 100644
--- a/ldap-parse.h
+++ b/ldap-parse.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997-2005 Luke Howard.
+/* 
+   Copyright (C) 1997-2005 Luke Howard
    This file is part of the nss_ldap library.
    Contributed by Luke Howard, <lukeh@padl.com>, 1997.
 
@@ -18,80 +19,12 @@
    Boston, MA 02111-1307, USA.
 
    $Id$
- */
+*/
 
 
 #ifndef _LDAP_NSS_LDAP_LDAP_PARSE_H
 #define _LDAP_NSS_LDAP_LDAP_PARSE_H
 
-#if defined(HAVE_NSSWITCH_H)
-#define NSS_ARGS(args)	((nss_XbyY_args_t *)args)
-
-#define LOOKUP_NAME(args, filter, selector, parser, req_buflen) \
-	ldap_args_t a; \
-	NSS_STATUS s; \
-	if (NSS_ARGS(args)->buf.buflen < req_buflen) { \
-		NSS_ARGS(args)->erange = 1; \
-		return NSS_TRYAGAIN; \
-	} \
-	LA_INIT(a); \
-	LA_STRING(a) = NSS_ARGS(args)->key.name; \
-	LA_TYPE(a) = LA_TYPE_STRING; \
-	s = _nss_ldap_getbyname(&a, \
-		NSS_ARGS(args)->buf.result, \
-		NSS_ARGS(args)->buf.buffer, \
-		NSS_ARGS(args)->buf.buflen, \
-		&NSS_ARGS(args)->erange, \
-		filter, \
-		selector, \
-		parser); \
-	if (s == NSS_SUCCESS) { \
-		NSS_ARGS(args)->returnval = NSS_ARGS(args)->buf.result; \
-	} \
-	return s
-#define LOOKUP_NUMBER(args, field, filter, selector, parser, req_buflen) \
-	ldap_args_t a; \
-	NSS_STATUS s; \
-	if (NSS_ARGS(args)->buf.buflen < req_buflen) { \
-		NSS_ARGS(args)->erange = 1; \
-		return NSS_TRYAGAIN; \
-	} \
-	LA_INIT(a); \
-	LA_NUMBER(a) = NSS_ARGS(args)->field; \
-	LA_TYPE(a) = LA_TYPE_NUMBER; \
-	s = _nss_ldap_getbyname(&a, \
-		NSS_ARGS(args)->buf.result, \
-		NSS_ARGS(args)->buf.buffer, \
-		NSS_ARGS(args)->buf.buflen, \
-		&NSS_ARGS(args)->erange, \
-		filter, \
-		selector, \
-		parser); \
-	if (s == NSS_SUCCESS) { \
-		NSS_ARGS(args)->returnval = NSS_ARGS(args)->buf.result; \
-	} \
-	return s
-#define LOOKUP_GETENT(args, be, filter, selector, parser, req_buflen) \
-	NSS_STATUS s; \
-	if (NSS_ARGS(args)->buf.buflen < req_buflen) { \
-		NSS_ARGS(args)->erange = 1; \
-		return NSS_TRYAGAIN; \
-	} \
-	s = _nss_ldap_getent(&((nss_ldap_backend_t *)be)->state, \
-		NSS_ARGS(args)->buf.result, \
-		NSS_ARGS(args)->buf.buffer, \
-		NSS_ARGS(args)->buf.buflen, \
-		&NSS_ARGS(args)->erange, \
-		filter, \
-		selector, \
-		parser); \
-	if (s == NSS_SUCCESS) { \
-		NSS_ARGS(args)->returnval = NSS_ARGS(args)->buf.result; \
-	} \
-	return s
-
-#elif defined(HAVE_NSS_H)
-
 #define LOOKUP_NAME(name, result, buffer, buflen, errnop, filter, selector, parser, req_buflen) \
 	ldap_args_t a; \
 	if (buflen < req_buflen) { \
@@ -119,63 +52,6 @@
 	} \
 	return _nss_ldap_getent(&key, result, buffer, buflen, errnop, filter, selector, parser)
 
-#elif defined(HAVE_IRS_H)
-
-#define LOOKUP_NAME(name, this, filter, selector, parser, req_buflen) \
-	ldap_args_t a; \
-	struct pvt *pvt = (struct pvt *)this->private; \
-	NSS_STATUS s; \
-	LA_INIT(a); \
-	LA_STRING(a) = name; \
-	LA_TYPE(a) = LA_TYPE_STRING; \
-	s = _nss_ldap_getbyname(&a, &pvt->result, pvt->buffer, sizeof(pvt->buffer), &errno, filter, \
-		selector, parser); \
-	if (s != NSS_SUCCESS) { \
-		MAP_ERRNO(s, errno); \
-		return NULL; \
-	} \
-	return &pvt->result;
-#define LOOKUP_NUMBER(number, this, filter, selector, parser, req_buflen) \
-	ldap_args_t a; \
-	struct pvt *pvt = (struct pvt *)this->private; \
-	NSS_STATUS s; \
-	LA_INIT(a); \
-	LA_NUMBER(a) = number; \
-	LA_TYPE(a) = LA_TYPE_NUMBER; \
-	s = _nss_ldap_getbyname(&a, &pvt->result, pvt->buffer, sizeof(pvt->buffer), &errno, filter, \
-		selector, parser); \
-	if (s != NSS_SUCCESS) { \
-		MAP_ERRNO(s, errno); \
-		return NULL; \
-	} \
-	return &pvt->result;
-#define LOOKUP_GETENT(this, filter, selector, parser, req_buflen) \
-	struct pvt *pvt = (struct pvt *)this->private; \
-	NSS_STATUS s; \
-	s = _nss_ldap_getent(&pvt->state, &pvt->result, pvt->buffer, \
-		sizeof(pvt->buffer), &errno, filter, \
-		selector, parser); \
-	if (s != NSS_SUCCESS) { \
-		MAP_ERRNO(s, errno); \
-		return NULL; \
-	} \
-	return &pvt->result;
-#endif /* HAVE_NSSWITCH_H */
-
-#if defined(HAVE_NSSWITCH_H)
-
-#define LOOKUP_SETENT(key) \
-	if (_nss_ldap_ent_context_init(&((nss_ldap_backend_t *)key)->state) == NULL) \
-		return NSS_UNAVAIL; \
-	return NSS_SUCCESS
-#define LOOKUP_ENDENT(key) \
-	_nss_ldap_enter(); \
-	_nss_ldap_ent_context_release(((nss_ldap_backend_t *)key)->state); \
-	_nss_ldap_leave(); \
-	return NSS_SUCCESS
-
-#elif defined(HAVE_NSS_H)
-
 #define LOOKUP_SETENT(key) \
 	if (_nss_ldap_ent_context_init(&key) == NULL) \
 		return NSS_UNAVAIL; \
@@ -186,17 +62,4 @@
 	_nss_ldap_leave(); \
 	return NSS_SUCCESS
 
-#elif defined(HAVE_IRS_H)
-
-#define LOOKUP_SETENT(this) \
-	struct pvt *pvt = (struct pvt *)this->private; \
-	(void) _nss_ldap_ent_context_init(&pvt->state)
-#define LOOKUP_ENDENT(this) \
-	struct pvt *pvt = (struct pvt *)this->private; \
-	_nss_ldap_enter(); \
-	_nss_ldap_ent_context_release(pvt->state); \
-	_nss_ldap_leave();
-
-#endif /* HAVE_NSSWITCH_H */
-
 #endif /* _LDAP_NSS_LDAP_LDAP_PARSE_H */