Fix ITS#3424

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 43382079322664f6e9e30f5d23e421cd95bec417..a501942d4e64860c10e50d4431ea57229dcca2ad 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -476,7 +476,7 @@ typedef struct slap_matching_rule {
 #define SLAP_MR_ORDERING               0x0200U
 #define SLAP_MR_SUBSTR                 0x0400U
 #define SLAP_MR_EXT                            0x0800U /* implicitly extensible */
-#define        SLAP_MR_ORDERED_INDEX           0x1000U
+#define        SLAP_MR_ORDERED_INDEX   0x1000U
 #ifdef LDAP_COMP_MATCH
 #define SLAP_MR_COMPONENT              0x2000U
 #endif
@@ -848,6 +848,7 @@ struct slap_internal_schema {
        AttributeDescription *si_ad_distinguishedName;
        AttributeDescription *si_ad_name;
        AttributeDescription *si_ad_cn;
+       AttributeDescription *si_ad_uid;
        AttributeDescription *si_ad_userPassword;
        AttributeDescription *si_ad_labeledURI;
 #ifdef SLAPD_AUTHPASSWD
@@ -2064,11 +2065,12 @@ typedef struct slap_paged_state {
 #define LDAP_PSEARCH_BY_SCOPEOUT       0x05
 #define LDAP_PSEARCH_BY_PREDELETE      0x06
 
-struct psid_entry {
+struct psid_entry {            /* DELETE ME */
        struct slap_op *ps_op;
        LDAP_LIST_ENTRY(psid_entry) ps_link;
 };
 
+#if 0  /* DELETE ME */
 struct slog_entry {
        struct berval sl_uuid;
        struct berval sl_name;
@@ -2083,6 +2085,7 @@ struct slap_session_entry {
        struct berval se_spec;
        LDAP_LIST_ENTRY( slap_session_entry ) se_link;
 };
+#endif
 
 struct slap_csn_entry {
        struct berval ce_csn;
@@ -2674,7 +2677,7 @@ typedef int (SLAP_CTRL_PARSE_FN) LDAP_P((
 #define LDAP_COMP_FILTER_ITEM          ((ber_tag_t) 0xa3U)
 #define LDAP_COMP_FILTER_UNDEFINED     ((ber_tag_t) 0xa4U)
 
-typedef struct slap_component_id{
+typedef struct slap_component_id {
        int     ci_type;
        struct slap_component_id *ci_next;
 
@@ -2729,10 +2732,12 @@ typedef struct slap_component_assertion_value {
        char* cav_ptr;
        char* cav_end;
 } ComponentAssertionValue;
-/*
+
+#if 0
 typedef int encoder_func LDAP_P((
        void* b,
-       void* comp));*/
+       void* comp));
+#endif
 
 struct slap_component_syntax_info;