mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-22 07:39:35 -05:00
add 'next[/prev]' initializer
This commit is contained in:
parent
14d64852e8
commit
46a841870f
2 changed files with 15 additions and 11 deletions
|
|
@ -129,6 +129,8 @@ struct name { \
|
||||||
|
|
||||||
#define LDAP_SLIST_HEAD_INITIALIZER(head) \
|
#define LDAP_SLIST_HEAD_INITIALIZER(head) \
|
||||||
{ NULL }
|
{ NULL }
|
||||||
|
#define LDAP_SLIST_NEXT_INITIALIZER(next) \
|
||||||
|
{ NULL }
|
||||||
|
|
||||||
#define LDAP_SLIST_ENTRY(type) \
|
#define LDAP_SLIST_ENTRY(type) \
|
||||||
struct { \
|
struct { \
|
||||||
|
|
@ -271,6 +273,8 @@ struct name { \
|
||||||
|
|
||||||
#define LDAP_LIST_HEAD_INITIALIZER(head) \
|
#define LDAP_LIST_HEAD_INITIALIZER(head) \
|
||||||
{ NULL }
|
{ NULL }
|
||||||
|
#define LDAP_LIST_NEXT_PREV_INITIALIZER(next, prev) \
|
||||||
|
{ NULL, NULL }
|
||||||
|
|
||||||
#define LDAP_LIST_ENTRY(type) \
|
#define LDAP_LIST_ENTRY(type) \
|
||||||
struct { \
|
struct { \
|
||||||
|
|
|
||||||
|
|
@ -80,47 +80,47 @@ char **slap_known_controls = NULL;
|
||||||
static struct slap_control control_defs[] = {
|
static struct slap_control control_defs[] = {
|
||||||
{ LDAP_CONTROL_VALUESRETURNFILTER,
|
{ LDAP_CONTROL_VALUESRETURNFILTER,
|
||||||
SLAP_CTRL_SEARCH, NULL,
|
SLAP_CTRL_SEARCH, NULL,
|
||||||
parseValuesReturnFilter, NULL },
|
parseValuesReturnFilter, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#ifdef LDAP_CONTROL_PAGEDRESULTS
|
#ifdef LDAP_CONTROL_PAGEDRESULTS
|
||||||
{ LDAP_CONTROL_PAGEDRESULTS,
|
{ LDAP_CONTROL_PAGEDRESULTS,
|
||||||
SLAP_CTRL_SEARCH, NULL,
|
SLAP_CTRL_SEARCH, NULL,
|
||||||
parsePagedResults, NULL },
|
parsePagedResults, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#endif
|
#endif
|
||||||
#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
|
#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
|
||||||
{ LDAP_CONTROL_X_DOMAIN_SCOPE,
|
{ LDAP_CONTROL_X_DOMAIN_SCOPE,
|
||||||
SLAP_CTRL_FRONTEND|SLAP_CTRL_SEARCH, NULL,
|
SLAP_CTRL_FRONTEND|SLAP_CTRL_SEARCH, NULL,
|
||||||
parseDomainScope, NULL },
|
parseDomainScope, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#endif
|
#endif
|
||||||
#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
|
#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
|
||||||
{ LDAP_CONTROL_X_PERMISSIVE_MODIFY,
|
{ LDAP_CONTROL_X_PERMISSIVE_MODIFY,
|
||||||
SLAP_CTRL_MODIFY, NULL,
|
SLAP_CTRL_MODIFY, NULL,
|
||||||
parsePermissiveModify, NULL },
|
parsePermissiveModify, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#endif
|
#endif
|
||||||
#ifdef LDAP_CONTROL_SUBENTRIES
|
#ifdef LDAP_CONTROL_SUBENTRIES
|
||||||
{ LDAP_CONTROL_SUBENTRIES,
|
{ LDAP_CONTROL_SUBENTRIES,
|
||||||
SLAP_CTRL_SEARCH, NULL,
|
SLAP_CTRL_SEARCH, NULL,
|
||||||
parseSubentries, NULL },
|
parseSubentries, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#endif
|
#endif
|
||||||
{ LDAP_CONTROL_NOOP,
|
{ LDAP_CONTROL_NOOP,
|
||||||
SLAP_CTRL_ACCESS, NULL,
|
SLAP_CTRL_ACCESS, NULL,
|
||||||
parseNoOp, NULL },
|
parseNoOp, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#ifdef LDAP_CLIENT_UPDATE
|
#ifdef LDAP_CLIENT_UPDATE
|
||||||
{ LDAP_CONTROL_CLIENT_UPDATE,
|
{ LDAP_CONTROL_CLIENT_UPDATE,
|
||||||
SLAP_CTRL_SEARCH, NULL,
|
SLAP_CTRL_SEARCH, NULL,
|
||||||
parseClientUpdate, NULL },
|
parseClientUpdate, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#endif
|
#endif
|
||||||
#ifdef LDAP_SYNC
|
#ifdef LDAP_SYNC
|
||||||
{ LDAP_CONTROL_SYNC,
|
{ LDAP_CONTROL_SYNC,
|
||||||
SLAP_CTRL_SEARCH, NULL,
|
SLAP_CTRL_SEARCH, NULL,
|
||||||
parseLdupSync, NULL },
|
parseLdupSync, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
#endif
|
#endif
|
||||||
{ LDAP_CONTROL_MANAGEDSAIT,
|
{ LDAP_CONTROL_MANAGEDSAIT,
|
||||||
SLAP_CTRL_ACCESS, NULL,
|
SLAP_CTRL_ACCESS, NULL,
|
||||||
parseManageDSAit, NULL },
|
parseManageDSAit, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
{ LDAP_CONTROL_PROXY_AUTHZ,
|
{ LDAP_CONTROL_PROXY_AUTHZ,
|
||||||
SLAP_CTRL_FRONTEND|SLAP_CTRL_ACCESS, proxy_authz_extops,
|
SLAP_CTRL_FRONTEND|SLAP_CTRL_ACCESS, proxy_authz_extops,
|
||||||
parseProxyAuthz, NULL },
|
parseProxyAuthz, LDAP_SLIST_NEXT_INITIALIZER(next) },
|
||||||
{ NULL, 0, NULL, 0, NULL }
|
{ NULL, 0, NULL, 0, LDAP_SLIST_NEXT_INITIALIZER(next) }
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue