Added a conformant sortedResults support which is unable to sort anything.

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index a419a941039c4046e3ba0679714ecc672a05f88e..29755901fea50c993e6d9202bf872225615442a9 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1173,6 +1173,7 @@ typedef enum slap_style_e {
        ACL_STYLE_ONE,
        ACL_STYLE_SUBTREE,
        ACL_STYLE_CHILDREN,
+       ACL_STYLE_LEVEL,
        ACL_STYLE_ATTROF,
        ACL_STYLE_ANONYMOUS,
        ACL_STYLE_USERS,
@@ -1302,6 +1303,8 @@ typedef struct slap_access {
 #define a_dn_pat       a_authz.sai_dn
 
        slap_style_t a_dn_style;
+       int                     a_dn_level;
+       int                     a_dn_self_level;
        AttributeDescription    *a_dn_at;
        int                     a_dn_self;
        int                     a_dn_expand;
@@ -1389,11 +1392,13 @@ typedef struct slap_acl_state {
 
 typedef struct slap_backend_info BackendInfo;  /* per backend type */
 typedef struct slap_backend_db BackendDB;              /* per backend database */
+typedef LDAP_STAILQ_HEAD(BeI, slap_backend_info) slap_bi_head;
+typedef LDAP_STAILQ_HEAD(BeDB, slap_backend_db) slap_be_head;
 
 LDAP_SLAPD_V (int) nBackendInfo;
 LDAP_SLAPD_V (int) nBackendDB;
-LDAP_SLAPD_V (BackendInfo *) backendInfo;
-LDAP_SLAPD_V (BackendDB *) backendDB;
+LDAP_SLAPD_V (slap_bi_head) backendInfo;
+LDAP_SLAPD_V (slap_be_head) backendDB;
 LDAP_SLAPD_V (BackendDB *) frontendDB;
 
 LDAP_SLAPD_V (int) slapMode;   
@@ -1736,6 +1741,7 @@ struct slap_backend_db {
        struct ConfigTable *be_cf_table;
 
        void    *be_private;    /* anything the backend database needs     */
+       LDAP_STAILQ_ENTRY(slap_backend_db) be_next;
 };
 
 struct slap_conn;
@@ -2068,6 +2074,7 @@ struct slap_backend_info {
        unsigned int bi_nDB;    /* number of databases of this type */
        struct ConfigTable *bi_cf_table;
        void    *bi_private;    /* anything the backend type needs */
+       LDAP_STAILQ_ENTRY(slap_backend_info) bi_next ;
 };
 
 #define c_authtype     c_authz.sai_method
@@ -2159,6 +2166,9 @@ struct slap_control_ids {
        int sc_modifyIncrement;
        int sc_noOp;
        int sc_pagedResults;
+#ifdef LDAP_DEVEL
+       int sc_sortedResults;
+#endif
        int sc_valuesReturnFilter;
        int sc_permissiveModify;
        int sc_domainScope;
@@ -2363,10 +2373,13 @@ typedef struct slap_op {
 
 #define o_pagedresults o_ctrlflag[slap_cids.sc_pagedResults]
 #define o_pagedresults_state   o_controls[slap_cids.sc_pagedResults]
+#define get_pagedresults(op)                   ((int)(op)->o_pagedresults)
 
-#define o_sync                 o_ctrlflag[slap_cids.sc_LDAPsync]
+#ifdef LDAP_DEVEL
+#define o_sortedresults                o_ctrlflag[slap_cids.sc_sortedResults]
+#endif
 
-#define get_pagedresults(op)                   ((int)(op)->o_pagedresults)
+#define o_sync                 o_ctrlflag[slap_cids.sc_LDAPsync]
 
        AuthorizationInformation o_authz;
 
@@ -2921,11 +2934,10 @@ struct zone_heap {
 #endif
 
 #define SLAP_BACKEND_INIT_MODULE(b) \
+       static BackendInfo bi;  \
        int \
        init_module( int argc, char *argv[] ) \
        { \
-               BackendInfo bi; \
-               memset( &bi, '\0', sizeof( bi ) ); \
                bi.bi_type = #b ; \
                bi.bi_init = b ## _back_initialize; \
                backend_add( &bi ); \