Use renamed initializers

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 7e4d9af3ed9db04d2fd66fe5149cf362e16f0c31..0b2ff439649d976f3bd2f001450ff8035049e07b 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -80,47 +80,47 @@ char **slap_known_controls = NULL;
 static struct slap_control control_defs[] = {
        { LDAP_CONTROL_VALUESRETURNFILTER,
                SLAP_CTRL_SEARCH, NULL,
-               parseValuesReturnFilter, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parseValuesReturnFilter, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #ifdef LDAP_CONTROL_PAGEDRESULTS
        { LDAP_CONTROL_PAGEDRESULTS,
                SLAP_CTRL_SEARCH, NULL,
-               parsePagedResults, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parsePagedResults, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
 #ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
        { LDAP_CONTROL_X_DOMAIN_SCOPE,
                SLAP_CTRL_FRONTEND|SLAP_CTRL_SEARCH, NULL,
-               parseDomainScope, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parseDomainScope, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
 #ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
        { LDAP_CONTROL_X_PERMISSIVE_MODIFY,
                SLAP_CTRL_MODIFY, NULL,
-               parsePermissiveModify, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parsePermissiveModify, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
 #ifdef LDAP_CONTROL_SUBENTRIES
        { LDAP_CONTROL_SUBENTRIES,
                SLAP_CTRL_SEARCH, NULL,
-               parseSubentries, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parseSubentries, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
        { LDAP_CONTROL_NOOP,
                SLAP_CTRL_ACCESS, NULL,
-               parseNoOp, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parseNoOp, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #ifdef LDAP_CLIENT_UPDATE
        { LDAP_CONTROL_CLIENT_UPDATE,
                SLAP_CTRL_SEARCH, NULL,
-               parseClientUpdate, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parseClientUpdate, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
 #ifdef LDAP_SYNC
        { LDAP_CONTROL_SYNC,
                SLAP_CTRL_SEARCH, NULL,
-               parseLdupSync, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parseLdupSync, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
        { LDAP_CONTROL_MANAGEDSAIT,
                SLAP_CTRL_ACCESS, NULL,
-               parseManageDSAit, LDAP_SLIST_NEXT_INITIALIZER(next) },
+               parseManageDSAit, LDAP_SLIST_ENTRY_INITIALIZER(next) },
        { LDAP_CONTROL_PROXY_AUTHZ,
                SLAP_CTRL_FRONTEND|SLAP_CTRL_ACCESS, proxy_authz_extops,
-               parseProxyAuthz, LDAP_SLIST_NEXT_INITIALIZER(next) },
-       { NULL, 0, NULL, 0, LDAP_SLIST_NEXT_INITIALIZER(next) }
+               parseProxyAuthz, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+       { NULL, 0, NULL, 0, LDAP_SLIST_ENTRY_INITIALIZER(next) }
 };
 
 /*