diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-23 12:02:04 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-23 12:02:04 +0000 |
| commit | 50212ad601575444d200291ee8cf105a8ac536ff (patch) | |
| tree | ad2300ae0ddba046fcaa2a124cf9c45faca3f5e6 | |
| parent | 48028bfbea62ff639bae8b95a860c4e6c6b24da9 (diff) | |
rearrange functions in more logical order
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@22 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | ldap-grp.c | 11 | ||||
| -rw-r--r-- | ldap-parse.h | 10 |
2 files changed, 11 insertions, 10 deletions
@@ -45,6 +45,7 @@ #include "ldap-nss.h" #include "util.h" +/* the context to use for {set,get,end}grent() calls */ static struct ent_context *gr_context = NULL; #ifdef HAVE_USERSEC_H @@ -1099,11 +1100,6 @@ enum nss_status _nss_ldap_setgrent (void) LOOKUP_SETENT (gr_context); } -enum nss_status _nss_ldap_endgrent (void) -{ - LOOKUP_ENDENT (gr_context); -} - enum nss_status _nss_ldap_getgrent_r (struct group *result, char *buffer, size_t buflen, int *errnop) @@ -1112,3 +1108,8 @@ _nss_ldap_getgrent_r (struct group *result, _nss_ldap_filt_getgrent, LM_GROUP, _nss_ldap_parse_gr, LDAP_NSS_BUFLEN_GROUP); } + +enum nss_status _nss_ldap_endgrent (void) +{ + LOOKUP_ENDENT (gr_context); +} diff --git a/ldap-parse.h b/ldap-parse.h index d465512..c1e1f1f 100644 --- a/ldap-parse.h +++ b/ldap-parse.h @@ -47,6 +47,11 @@ LA_TYPE(a) = LA_TYPE_NUMBER; \ return _nss_ldap_getbyname(&a, result, buffer, buflen, errnop, filter, selector, parser) +#define LOOKUP_SETENT(key) \ + if (_nss_ldap_ent_context_init(&key) == NULL) \ + return NSS_STATUS_UNAVAIL; \ + return NSS_STATUS_SUCCESS + #define LOOKUP_GETENT(key, result, buffer, buflen, errnop, filter, selector, parser, req_buflen) \ if (buflen < req_buflen) { \ *errnop = ERANGE; \ @@ -54,11 +59,6 @@ } \ 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_STATUS_UNAVAIL; \ - return NSS_STATUS_SUCCESS - #define LOOKUP_ENDENT(key) \ _nss_ldap_enter(); \ _nss_ldap_ent_context_release(key); \ |