diff options
author | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-16 15:02:07 +0000 |
---|---|---|
committer | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-16 15:02:07 +0000 |
commit | 512b4873fd3bf2a5fa05cff1002046113e8c0a9a (patch) | |
tree | 07d06309c5a7bd7efb006af860f23802d32abcce /ldap-parse.h | |
parent | 88695a793688dafe49d04fc6a9940edf2dc5ae97 (diff) |
some more cleanups, expanding some MACROs and typedefs and get rid of some more code
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@17 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'ldap-parse.h')
-rw-r--r-- | ldap-parse.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ldap-parse.h b/ldap-parse.h index 0fc57fd..bce9e43 100644 --- a/ldap-parse.h +++ b/ldap-parse.h @@ -26,20 +26,20 @@ #define _LDAP_NSS_LDAP_LDAP_PARSE_H #define LOOKUP_NAME(name, result, buffer, buflen, errnop, filter, selector, parser, req_buflen) \ - ldap_args_t a; \ + struct ldap_args a; \ if (buflen < req_buflen) { \ *errnop = ERANGE; \ - return NSS_TRYAGAIN; \ + return NSS_STATUS_TRYAGAIN; \ } \ LA_INIT(a); \ LA_STRING(a) = name; \ LA_TYPE(a) = LA_TYPE_STRING; \ return _nss_ldap_getbyname(&a, result, buffer, buflen, errnop, filter, selector, parser); #define LOOKUP_NUMBER(number, result, buffer, buflen, errnop, filter, selector, parser, req_buflen) \ - ldap_args_t a; \ + struct ldap_args a; \ if (buflen < req_buflen) { \ *errnop = ERANGE; \ - return NSS_TRYAGAIN; \ + return NSS_STATUS_TRYAGAIN; \ } \ LA_INIT(a); \ LA_NUMBER(a) = number; \ @@ -48,18 +48,18 @@ #define LOOKUP_GETENT(key, result, buffer, buflen, errnop, filter, selector, parser, req_buflen) \ if (buflen < req_buflen) { \ *errnop = ERANGE; \ - return NSS_TRYAGAIN; \ + return NSS_STATUS_TRYAGAIN; \ } \ return _nss_ldap_getent(&key, result, buffer, buflen, errnop, filter, selector, parser) #define LOOKUP_SETENT(key) \ if (_nss_ldap_ent_context_init(&key) == NULL) \ - return NSS_UNAVAIL; \ - return NSS_SUCCESS + return NSS_STATUS_UNAVAIL; \ + return NSS_STATUS_SUCCESS #define LOOKUP_ENDENT(key) \ _nss_ldap_enter(); \ _nss_ldap_ent_context_release(key); \ _nss_ldap_leave(); \ - return NSS_SUCCESS + return NSS_STATUS_SUCCESS #endif /* _LDAP_NSS_LDAP_LDAP_PARSE_H */ |