switch to openldap-data directory

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d3f69f76eab73245fc7e0bf7966f42314f8628b2..9bf1b8dd1f78ff03517395bb8a1d4cb8ca59a72d 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -206,7 +206,6 @@ typedef struct slap_ssf_set {
 #define SLAP_INDEX_SUBSTR_INITIAL_PREFIX '^'
 #define SLAP_INDEX_SUBSTR_FINAL_PREFIX '$'
 #define SLAP_INDEX_CONT_PREFIX         '.'             /* prefix for continuation keys */
-#define SLAP_INDEX_UNKNOWN_PREFIX      '?'             /* prefix for unknown keys */
 
 #define SLAP_SYNTAX_MATCHINGRULES_OID  "1.3.6.1.4.1.1466.115.121.1.30"
 #define SLAP_SYNTAX_ATTRIBUTETYPES_OID "1.3.6.1.4.1.1466.115.121.1.3"
@@ -537,9 +536,9 @@ typedef struct slap_attr_name {
 } AttributeName;
 
 #define slap_ad_is_lang(ad)                    ( (ad)->ad_lang.bv_len != 0 )
-#define slap_ad_is_binary(ad)          \
-       ( ((ad)->ad_flags & SLAP_DESC_LANG_RANGE) ? 1 : 0 )
 #define slap_ad_is_lang_range(ad)      \
+       ( ((ad)->ad_flags & SLAP_DESC_LANG_RANGE) ? 1 : 0 )
+#define slap_ad_is_binary(ad)          \
        ( ((ad)->ad_flags & SLAP_DESC_BINARY) ? 1 : 0 )
 
 /*
@@ -698,7 +697,7 @@ typedef struct slap_filter {
 #define f_sub_final            f_un.f_un_ssa->sa_final
 #define f_mra                  f_un.f_un_mra
 #define f_mr_rule              f_un.f_un_mra->ma_rule
-#define f_mr_rule_text         f_un.f_un_mra->ma_rule_text
+#define f_mr_rule_text f_un.f_un_mra->ma_rule_text
 #define f_mr_desc              f_un.f_un_mra->ma_desc
 #define f_mr_value             f_un.f_un_mra->ma_value
 #define        f_mr_dnattrs    f_un.f_un_mra->ma_dnattrs
@@ -910,14 +909,14 @@ typedef struct slap_access {
        int                     a_dn_self;
 
        slap_style_t a_peername_style;
-       char            *a_peername_pat;
+       struct berval   a_peername_pat;
        slap_style_t a_sockname_style;
-       char            *a_sockname_pat;
+       struct berval   a_sockname_pat;
 
        slap_style_t a_domain_style;
-       char            *a_domain_pat;
+       struct berval   a_domain_pat;
        slap_style_t a_sockurl_style;
-       char            *a_sockurl_pat;
+       struct berval   a_sockurl_pat;
        slap_style_t a_set_style;
        struct berval   a_set_pat;
 
@@ -1409,8 +1408,9 @@ typedef struct slap_op {
        char o_managedsait;
        char o_subentries;
        char o_subentries_visibility;
+       char o_noop;
 
-       int             o_abandon;      /* abandon flag */
+       char o_abandon; /* abandon flag */
        ldap_pvt_thread_mutex_t o_abandonmutex; /* protects o_abandon  */
 
 #ifdef LDAP_CONNECTIONLESS
@@ -1435,13 +1435,13 @@ typedef struct slap_op {
  * Caches the result of a backend_group check for ACL evaluation
  */
 typedef struct slap_gacl {
-       struct slap_gacl *next;
-       Backend *be;
-       ObjectClass *oc;
-       AttributeDescription *at;
-       int res;
-       ber_len_t len;
-       char ndn[1];
+       struct slap_gacl *ga_next;
+       Backend *ga_be;
+       ObjectClass *ga_oc;
+       AttributeDescription *ga_at;
+       int ga_res;
+       ber_len_t ga_len;
+       char ga_ndn[1];
 } GroupAssertion;
 
 /*
@@ -1459,10 +1459,10 @@ typedef struct slap_conn {
        time_t          c_activitytime; /* when the connection was last used */
        unsigned long           c_connid;       /* id of this connection for stats*/
 
-       char            *c_listener_url;        /* listener URL */
-       char            *c_peer_domain; /* DNS name of client */
-       char            *c_peer_name;   /* peer name (trans=addr:port) */
-       char            *c_sock_name;   /* sock name (trans=addr:port) */
+       struct berval   c_listener_url; /* listener URL */
+       struct berval   c_peer_domain;  /* DNS name of client */
+       struct berval   c_peer_name;    /* peer name (trans=addr:port) */
+       struct berval   c_sock_name;    /* sock name (trans=addr:port) */
 
        /* only can be changed by binding thread */
        int             c_sasl_bind_in_progress;        /* multi-op bind in progress */
@@ -1500,9 +1500,9 @@ typedef struct slap_conn {
        void    *c_sasl_context;        /* SASL session context */
        void    *c_sasl_extra;          /* SASL session extra stuff */
 
-       long    c_n_ops_received;               /* num of ops received (next op_id) */
+       long    c_n_ops_received;       /* num of ops received (next op_id) */
        long    c_n_ops_executing;      /* num of ops currently executing */
-       long    c_n_ops_pending;                /* num of ops pending execution */
+       long    c_n_ops_pending;        /* num of ops pending execution */
        long    c_n_ops_completed;      /* num of ops completed */
 
        long    c_n_get;                /* num of get calls */
@@ -1529,11 +1529,11 @@ typedef struct slap_conn {
 #define SASL_AUTHZ_DEST_ATTR "saslAuthzFrom"
 
 typedef struct sasl_regexp {
-  char *match;                            /* regexp match pattern */
-  char *replace;                          /* regexp replace pattern */
-  regex_t workspace;                      /* workspace for regexp engine */
-  regmatch_t strings[SASLREGEX_REPLACE];  /* strings matching $1,$2 ... */
-  int offset[SASLREGEX_REPLACE+2];        /* offsets of $1,$2... in *replace */
+  char *sr_match;                                                      /* regexp match pattern */
+  char *sr_replace;                                                    /* regexp replace pattern */
+  regex_t sr_workspace;                                                /* workspace for regexp engine */
+  regmatch_t sr_strings[SASLREGEX_REPLACE];    /* strings matching $1,$2 ... */
+  int sr_offset[SASLREGEX_REPLACE+2];          /* offsets of $1,$2... in *replace */
 } SaslRegexp_t;
 
 /*