Misc Bug Fix:

- Remove unused variables
- Remove the attribute for component filter test in core.schema

diff --git a/servers/slapd/asn.h b/servers/slapd/asn.h
index 44439d0782b401b8a6ef2e2e10b1892729d8cb54..17ed6f3f4286aff47a7119aa5390509afdc371f1 100644 (file)
--- a/servers/slapd/asn.h
+++ b/servers/slapd/asn.h
@@ -16,14 +16,12 @@
  */
 
 #ifdef LDAP_COMP_MATCH
-#include <asn-incl.h>
+#ifndef _H_ASN
+#define _H_ASN
 
-#define AsnId AsnOcts
 #define NUM_ENCODING_TYPE 2
 
-typedef enum { BER, GSER } EncRulesType;
 typedef enum { ASN_BASIC, ASN_COMPOSITE } AsnType;
-static EncRulesType rulesListG[NUM_ENCODING_TYPE] = { BER, GSER };
 
 typedef enum AsnTypeId {
        BASICTYPE_BOOLEAN,      /* 1 */
@@ -65,3 +63,4 @@ typedef enum AsnTypeId {
        ASNTYPE_END
 } AsnTypeId;
 #endif
+#endif

diff --git a/servers/slapd/component.c b/servers/slapd/component.c
index f2e73f3a5dd38dd11ab4932332cbde4b518bcf4b..9e006e21982d2a5e4f0cdd173175b6a3abbf8f22 100644 (file)
--- a/servers/slapd/component.c
+++ b/servers/slapd/component.c
@@ -781,8 +781,6 @@ test_comp_filter_item(
        int rc = LDAP_COMPARE_TRUE;
        int len;
        ComponentSyntaxInfo* csi_attr, *csi_assert;
-       GenBuf* genBuf;
-       ExpBuf* buf;
 
        if ( (ca->ca_ma_rule->smr_usage & SLAP_MR_COMPONENT) && ca->ca_cf ) {
                /* componentFilterMatch inside of componentFilterMatch */

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index b336dc51f9577185779712116ff9b8b9dd343411..0694860720c5cd06b7aa05b9e3909b8a8dcf465f 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -255,12 +255,6 @@ attributetype ( 2.5.4.37 NAME 'cACertificate'
        EQUALITY certificateExactMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )
 
-# Component Filter Testing
-attributetype ( 1.3.6.1.4.1.4203.666.1.33 NAME 'componentTest'
-       DESC 'RFC3687 Component Matching , use ;gser'
-       EQUALITY componentFilterMatch 
-       SYNTAX 1.2.36.79672281.1.5.2 )
-
 # Must be transferred using ;binary
 attributetype ( 2.5.4.38 NAME 'authorityRevocationList'
        DESC 'RFC2256: X.509 authority revocation list, use ;binary'
@@ -391,7 +385,7 @@ objectclass ( 2.5.6.6 NAME 'person'
        DESC 'RFC2256: a person'
        SUP top STRUCTURAL
        MUST ( sn $ cn )
-       MAY ( userPassword $ telephoneNumber $ seeAlso $ description $componentTest ) )
+       MAY ( userPassword $ telephoneNumber $ seeAlso $ description ) )
 
 objectclass ( 2.5.6.7 NAME 'organizationalPerson'
        DESC 'RFC2256: an organizational person'

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index a309bf324bea25dfa43dbfe938282ddb60e9b052..85eac6ed91afd888b5bf44eee67b066ba0f155d3 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2556,13 +2556,13 @@ typedef struct slap_component_assertion_value {
 #include "asn.h"
 
 typedef int encoder_func LDAP_P((
-       GenBuf* b,
+       void* b,
        void* comp));
 
 struct slap_component_syntax_info;
 
 typedef int decoder_func LDAP_P((
-       GenBuf* b,
+       void* b,
        struct slap_component_syntax_info** comp_syn_info,
        unsigned int* len,
        int mode));