]> git.sur5r.net Git - openldap/blobdiff - contrib/slapd-modules/comp_match/componentlib.c
Merge remote-tracking branch 'origin/mdb.master'
[openldap] / contrib / slapd-modules / comp_match / componentlib.c
index fa160e8d095bf33f550ce45c8fd15ed3280f07a6..93141b3bc88cccd5b78e44a4282dcb3476e23e51 100644 (file)
@@ -16,8 +16,9 @@
 #include "lutil.h"
 #include <ldap.h>
 #include "slap.h"
-
 #include "component.h"
+
+#include "componentlib.h"
 #include "asn.h"
 #include <asn-gser.h>
 #include <stdlib.h>
@@ -60,6 +61,21 @@ FreeComponentBits ( ComponentBits* v ) {
        FreeAsnBits( &v->value );
 }
 
+/*
+ * GSER Encoder : BIT STRING
+ */
+int
+GEncComponentBits ( GenBuf *b, ComponentBits *in )
+{
+       GAsnBits bits = {0};
+
+       bits.value = in->value;
+       if ( !in )
+               return (-1);
+       return GEncAsnBitsContent ( b, &bits);
+}
+
+
 /*
  * GSER Decoder : BIT STRING
  */
@@ -86,23 +102,8 @@ GDecComponentBits ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int
                return LDAP_DECODING_ERROR;
        }
        k->value = result.value;
+       k->comp_desc = get_component_description (BASICTYPE_BITSTRING);
 
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc ) {
-               if ( k ) CompFree( mem_op,  k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentBits;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentBits;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentBits;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_BITSTRING;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentBits;
-       /* Real Decoding code need to be followed */
        return LDAP_SUCCESS;
 }
 
@@ -146,25 +147,25 @@ BDecComponentBits ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
        }
 
        k->value = result;
-
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree( mem_op,  k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentBits;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentBits;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentBits;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_BITSTRING;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentBits;
+       k->comp_desc = get_component_description (BASICTYPE_BITSTRING);
  
        return LDAP_SUCCESS;
 }
 
+/*
+ * Component GSER BMPString Encoder
+ */
+int
+GEncComponentBMPString ( GenBuf *b, ComponentBMPString *in )
+{
+       GBMPString t = {0};
+
+       if ( !in || in->value.octetLen <= 0 )
+               return (-1);
+       t.value = in->value;
+       return GEncBMPStringContent ( b, &t );
+}
+
 /*
  * Component GSER BMPString Decoder
  */
@@ -194,21 +195,7 @@ GDecComponentBMPString ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded,
        }
 
        k->value = result.value;
-
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentBMPString;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentBMPString;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentBMPString;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_BMP_STR;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentBMPString;
+       k->comp_desc = get_component_description (BASICTYPE_BMP_STR);
  
        return LDAP_SUCCESS;
 
@@ -254,26 +241,25 @@ BDecComponentBMPString ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void
        }
 
        k->value = result;
-
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentBMPString;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentBMPString;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentBMPString;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_BMP_STR;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentBMPString;
+       k->comp_desc = get_component_description (BASICTYPE_BMP_STR);
  
        return LDAP_SUCCESS;
 
 }
 
+/*
+ * Component GSER Encoder : UTF8 String
+ */
+int
+GEncComponentUTF8String ( GenBuf *b, ComponentUTF8String *in )
+{
+       GUTF8String t = {0};
+       if ( !in || in->value.octetLen <= 0 )
+               return (-1);
+       t.value = in->value;
+       return GEncUTF8StringContent ( b, &t );
+}
+
 /*
  * Component GSER Decoder :  UTF8 String
  */
@@ -303,21 +289,7 @@ GDecComponentUTF8String ( void* mem_op, GenBuf *b, void *v,
        }
        
        k->value = result.value;
-
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree( mem_op,  k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentUTF8String;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentUTF8String;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentUTF8String;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_UTF8_STR;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentUTF8String;
+       k->comp_desc = get_component_description (BASICTYPE_UTF8_STR);
  
        return LDAP_SUCCESS;
 }
@@ -361,21 +333,23 @@ BDecComponentUTF8String ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len,
        }
 
        k->value = result;
+       k->comp_desc = get_component_description (BASICTYPE_UTF8_STR);
 
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentUTF8String;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentUTF8String;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentUTF8String;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_UTF8_STR;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentUTF8String;
+       return LDAP_SUCCESS;
+}
+
+/*
+ * Component GSER Encoder :  Teletex String
+ */
+int
+GEncComponentTeletexString ( GenBuf *b, ComponentTeletexString *in )
+{
+       GTeletexString t = {0};
+
+       if ( !in || in->value.octetLen <= 0 )
+               return (-1);
+       t.value = in->value;
+       return GEncTeletexStringContent ( b, &t );
 }
 
 /*
@@ -407,21 +381,7 @@ GDecComponentTeletexString  ( void* mem_op, GenBuf *b, void *v,
        }
 
        k->value = result.value;
-
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentTeletexString;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentTeletexString;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentTeletexString;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_VIDEOTEX_STR;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentTeletexString;
+       k->comp_desc = get_component_description (BASICTYPE_VIDEOTEX_STR);
  
        return LDAP_SUCCESS;
 }
@@ -449,6 +409,20 @@ MatchingComponentBool(char* oid, ComponentSyntaxInfo* csi_attr,
         return (a->value == b->value) ? LDAP_COMPARE_TRUE:LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : BOOLEAN
+ */
+int
+GEncComponentBool ( GenBuf *b, ComponentBool *in )
+{
+       GAsnBool t = {0};
+
+       if ( !in )
+               return (-1);
+       t.value = in->value;
+       return GEncAsnBoolContent ( b, &t );
+}
+
 /*
  * GSER Decoder : BOOLEAN
  */
@@ -475,21 +449,7 @@ GDecComponentBool ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int
        }
 
        k->value = result.value;
-
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentBool;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentBool;
-       k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_BOOLEAN;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentBool;
+       k->comp_desc = get_component_description (BASICTYPE_BOOLEAN);
  
         return LDAP_SUCCESS;
 }
@@ -532,22 +492,8 @@ BDecComponentBool ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
        }
 
        k->value = result;
+       k->comp_desc = get_component_description (BASICTYPE_BOOLEAN);
 
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentBool;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentBool;
-       k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_BOOLEAN;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentBool;
         return LDAP_SUCCESS;
 }
 
@@ -574,6 +520,20 @@ MatchingComponentEnum ( char* oid, ComponentSyntaxInfo *csi_attr,
         return rc ? LDAP_COMPARE_TRUE:LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : ENUMERATE
+ */
+int
+GEncComponentEnum ( GenBuf *b, ComponentEnum *in )
+{
+       GAsnEnum t = {0};
+
+       if ( !in )
+               return (-1);
+       t.value = in->value;
+       return GEncAsnEnumContent ( b, &t );
+}
+
 /*
  * GSER Decoder : ENUMERATE
  */
@@ -608,11 +568,10 @@ GDecComponentEnum ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentEnum;
        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentEnum;
        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentEnum;
        k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
        k->comp_desc->cd_extract_i = NULL;
        k->comp_desc->cd_type = ASN_BASIC;
        k->comp_desc->cd_type_id = BASICTYPE_ENUMERATED;
@@ -666,11 +625,10 @@ BDecComponentEnum ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
                if ( k  ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentEnum;
         k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentEnum;
         k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentEnum;
        k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
         k->comp_desc->cd_extract_i = NULL;
         k->comp_desc->cd_type = ASN_BASIC;
         k->comp_desc->cd_type_id = BASICTYPE_ENUMERATED;
@@ -680,8 +638,17 @@ BDecComponentEnum ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
 }
 
 /*
- * IA5String
+ * Component GSER Encoder : IA5String
  */
+int
+GEncComponentIA5Stirng ( GenBuf *b, ComponentIA5String* in )
+{
+       GIA5String t = {0};
+       t.value = in->value;
+       if ( !in || in->value.octetLen <= 0 ) return (-1);
+       return GEncIA5StringContent( b, &t );
+}
+
 /*
  * Component BER Decoder : IA5String
  */
@@ -727,11 +694,10 @@ BDecComponentIA5String ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentIA5String;
         k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentIA5String;
         k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentIA5String;
        k->comp_desc->cd_free = (comp_free_func*)FreeComponentIA5String;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
         k->comp_desc->cd_extract_i = NULL;
         k->comp_desc->cd_type = ASN_BASIC;
         k->comp_desc->cd_type_id = BASICTYPE_IA5_STR;
@@ -764,6 +730,20 @@ function*/
         return ( a->value == b->value ) ? LDAP_COMPARE_TRUE:LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : INTEGER
+ */
+int
+GEncComponentInt ( GenBuf *b, ComponentInt* in )
+{
+       GAsnInt t = {0};
+
+       if ( !in )
+               return (-1);
+       t.value = in->value;
+       return GEncAsnIntContent ( b, &t );
+}
+
 /*
  * GSER Decoder : INTEGER 
  */
@@ -790,21 +770,7 @@ GDecComponentInt( void* mem_op, GenBuf * b, void *v, AsnLen *bytesDecoded, int m
                return LDAP_DECODING_ERROR;
        }
        k->value = result.value;
-
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentInt;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentInt;
-       k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_INTEGER;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentInt;
+       k->comp_desc = get_component_description (BASICTYPE_INTEGER );
 
         return LDAP_SUCCESS;
 }
@@ -844,20 +810,7 @@ BDecComponentInt ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
        }
        k->value = result;
 
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentInt;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentInt;
-       k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_INTEGER;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentInt;
+       k->comp_desc = get_component_description (BASICTYPE_INTEGER );
         
         return LDAP_SUCCESS;
 }
@@ -883,6 +836,20 @@ MatchingComponentNull ( char *oid, ComponentSyntaxInfo *csi_attr,
         return (a->value == b->value) ? LDAP_COMPARE_TRUE:LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : NULL
+ */
+int
+GEncComponentNull ( GenBuf *b, ComponentNull *in )
+{
+       GAsnNull t = {0};
+
+       if ( !in )
+               return (-1);
+       t.value = in->value;
+       return GEncAsnNullContent ( b, &t );
+}
+
 /*
  * GSER Decoder : NULL
  */
@@ -915,11 +882,10 @@ GDecComponentNull ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentNull;
        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentNull;
        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentNull;
        k->comp_desc->cd_free = (comp_free_func*)FreeComponentNull;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
        k->comp_desc->cd_extract_i = NULL;
        k->comp_desc->cd_type = ASN_BASIC;
        k->comp_desc->cd_type_id = BASICTYPE_NULL;
@@ -974,11 +940,10 @@ BDecComponentNull ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentNull;
        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentNull;
        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentNull;
        k->comp_desc->cd_free = (comp_free_func*)FreeComponentNull;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
        k->comp_desc->cd_extract_i = NULL;
        k->comp_desc->cd_type = ASN_BASIC;
        k->comp_desc->cd_type_id = BASICTYPE_NULL;
@@ -1029,11 +994,10 @@ BDecComponentNumericString ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len,
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentNumericString;
         k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentNumericString;
         k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentNumericString;
        k->comp_desc->cd_free = (comp_free_func*)FreeComponentNumericString;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
         k->comp_desc->cd_extract_i = NULL;
         k->comp_desc->cd_type = ASN_BASIC;
         k->comp_desc->cd_type_id = BASICTYPE_NUMERIC_STR;
@@ -1077,6 +1041,20 @@ MatchingComponentOcts ( char* oid, ComponentSyntaxInfo* csi_attr,
                return LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : OCTET STRING
+ */
+int
+GEncComponentOcts ( GenBuf* b, ComponentOcts *in )
+{
+       GAsnOcts t = {0};
+       if ( !in || in->value.octetLen <= 0 )
+               return (-1);
+
+       t.value = in->value;
+       return GEncAsnOctsContent ( b, &t );
+}
+
 /*
  * GSER Decoder : OCTET STRING
  */
@@ -1109,11 +1087,10 @@ GDecComponentOcts ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentOcts;
        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentOcts;
        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentOcts;
        k->comp_desc->cd_free = (comp_free_func*)FreeComponentOcts;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
        k->comp_desc->cd_extract_i = NULL;
        k->comp_desc->cd_type = ASN_BASIC;
        k->comp_desc->cd_type_id = BASICTYPE_OCTETSTRING;
@@ -1166,11 +1143,10 @@ BDecComponentOcts ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
+       k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentOcts;
         k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentOcts;
         k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentOcts;
        k->comp_desc->cd_free = (comp_free_func*)FreeComponentOcts;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
         k->comp_desc->cd_extract_i = NULL;
         k->comp_desc->cd_type = ASN_BASIC;
         k->comp_desc->cd_type_id = BASICTYPE_OCTETSTRING;
@@ -1204,6 +1180,19 @@ MatchingComponentOid ( char *oid, ComponentSyntaxInfo *csi_attr ,
         return rc ? LDAP_COMPARE_TRUE:LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : OID
+ */
+GEncComponentOid ( GenBuf *b, ComponentOid *in )
+{
+       GAsnOid t = {0};
+
+       if ( !in || in->value.octetLen <= 0 )
+               return (-1);
+       t.value = in->value;
+       return GEncAsnOidContent( b, (GAsnOcts*)&t );
+}
+
 /*
  * GSER Decoder : OID
  */
@@ -1226,7 +1215,7 @@ GDecAsnDescOidContent ( void* mem_op, GenBuf *b, GAsnOid *result, AsnLen *bytesD
        peek_head = ad_type->sat_atype.at_oid;
        strLen = strlen ( peek_head );
 
-       result->value.octs = EncodeComponentOid ( mem_op, peek_head , &strLen );
+       result->value.octs = (char*)EncodeComponentOid ( mem_op, peek_head , &strLen );
        result->value.octetLen = strLen;
        return LDAP_SUCCESS;
 }
@@ -1280,21 +1269,7 @@ GDecComponentOid ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int m
                }
        }
        k->value = result.value;
-
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentOid;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentOid;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentOid;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_OID;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentOid;
+       k->comp_desc = get_component_description (BASICTYPE_OID);
 
        return LDAP_SUCCESS;
 }
@@ -1338,20 +1313,8 @@ BDecComponentOid ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
        }
        k->value = result;
 
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentOid;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentOid;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentOid;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_OID;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentOid;
+       k->comp_desc = get_component_description (BASICTYPE_OID);
+
        return LDAP_SUCCESS;
 }
 
@@ -1395,23 +1358,57 @@ BDecComponentPrintableString( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len,
        }
        k->value = result;
 
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
+       k->comp_desc = get_component_description (BASICTYPE_PRINTABLE_STR);
+
+       return LDAP_SUCCESS;
+}
+
+/*
+ * Component BER Decoder : TeletexString
+ */
+
+int
+BDecComponentTeletexStringTag ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int mode )
+{
+       return BDecComponentTeletexString ( mem_op, b, 0, 0, v, bytesDecoded, mode|CALL_TAG_DECODER );
+}
+
+int
+BDecComponentTeletexString( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v, AsnLen *bytesDecoded, int mode )
+{
+        char* peek_head;
+        int i, strLen, rc;
+        void* component_values;
+        ComponentTeletexString* k, **k2;
+       AsnOid result;
+                                                                          
+        k = (ComponentTeletexString*) v;
+                                                                          
+        if ( mode & DEC_ALLOC_MODE_0 ) {
+                k2 = (ComponentTeletexString**) v;
+                *k2 = (ComponentTeletexString*) CompAlloc( mem_op, sizeof( ComponentTeletexString ) );
+               if ( !*k2 ) return LDAP_DECODING_ERROR;
+                k = *k2;
+        }
+
+       if ( mode & CALL_TAG_DECODER ) {
+               mode = mode & CALL_CONTENT_DECODER;
+               rc = BDecTeletexString ( mem_op, b, &result, bytesDecoded );
+       } else {
+               rc = BDecTeletexStringContent ( mem_op, b, tagId, len, &result, bytesDecoded );
+       }
+       if ( rc < 0 ) {
                if ( k ) CompFree ( mem_op, k );
                return LDAP_DECODING_ERROR;
        }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentPrintableString;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentPrintableString;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentPrintableString;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_PRINTABLE_STR;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentPrintableString;
+       k->value = result;
+
+       k->comp_desc = get_component_description (BASICTYPE_T61_STR);
+
        return LDAP_SUCCESS;
 }
 
+
 /*
  * Matching function : Real
  */
@@ -1435,6 +1432,19 @@ MatchingComponentReal (char* oid, ComponentSyntaxInfo *csi_attr,
         return rc ? LDAP_COMPARE_TRUE:LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : Real
+ */
+int
+GEncComponentReal ( GenBuf *b, ComponentReal *in )
+{
+       GAsnReal t = {0};
+       if ( !in )
+               return (-1);
+       t.value = in->value;
+       return GEncAsnRealContent ( b, &t );
+}
+
 /*
  * GSER Decoder : Real
  */
@@ -1461,21 +1471,7 @@ GDecComponentReal ( void* mem_op, GenBuf *b, void *v, AsnLen *bytesDecoded, int
                return LDAP_DECODING_ERROR;
        }
        k->value = result.value;
-
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentReal;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentReal;
-       k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_REAL;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentReal;
+       k->comp_desc = get_component_description (BASICTYPE_REAL);
 
         return LDAP_SUCCESS;
 }
@@ -1517,21 +1513,7 @@ BDecComponentReal ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, void *v,
                return LDAP_DECODING_ERROR;
        }
        k->value = result;
-
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentReal;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentReal;
-       k->comp_desc->cd_free = (comp_free_func*)NULL;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_REAL;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentReal;
+       k->comp_desc = get_component_description (BASICTYPE_REAL);
 
         return LDAP_SUCCESS;
 }
@@ -1563,6 +1545,20 @@ MatchingComponentRelativeOid ( char* oid, ComponentSyntaxInfo *csi_attr,
         return rc ? LDAP_COMPARE_TRUE:LDAP_COMPARE_FALSE;
 }
 
+/*
+ * GSER Encoder : RELATIVE_OID.
+ */
+int
+GEncComponentRelativeOid ( GenBuf *b, ComponentRelativeOid *in )
+{
+       GAsnRelativeOid t = {0};
+
+       if ( !in || in->value.octetLen <= 0 )
+               return (-1);
+       t.value = in->value;
+       return GEncAsnRelativeOidContent ( b , (GAsnOcts*)&t );
+}
+
 /*
  * GSER Decoder : RELATIVE_OID.
  */
@@ -1589,22 +1585,8 @@ GDecComponentRelativeOid ( void* mem_op, GenBuf *b,void *v, AsnLen *bytesDecoded
                return LDAP_DECODING_ERROR;
        }
        k->value = result.value;
+       k->comp_desc = get_component_description (BASICTYPE_OID);
 
-       k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-       k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentRelativeOid;
-       k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentRelativeOid;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentRelativeOid;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-       k->comp_desc->cd_extract_i = NULL;
-       k->comp_desc->cd_type = ASN_BASIC;
-       k->comp_desc->cd_type_id = BASICTYPE_OID;
-       k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentRelativeOid;
-       
        return LDAP_SUCCESS;
 }
 
@@ -1645,26 +1627,26 @@ BDecComponentRelativeOid ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len, vo
                return LDAP_DECODING_ERROR;
        }
        k->value = result;
+       k->comp_desc = get_component_description (BASICTYPE_OID);
 
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentRelativeOid;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentRelativeOid;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentRelativeOid;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_RELATIVE_OID;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentRelativeOid;
        return LDAP_SUCCESS;
 }
 
 /*
- * GSER Decoder : UniverseString
+ * GSER Encoder : UniversalString
+ */
+int
+GEncComponentUniversalString ( GenBuf *b, ComponentUniversalString *in )
+{
+       GUniversalString t = {0};
+       if ( !in || in->value.octetLen <= 0 )
+               return (-1);
+       t.value = in->value;
+       return GEncUniversalStringContent( b, &t );
+}
+
+/*
+ * GSER Decoder : UniversalString
  */
 static int
 UTF8toUniversalString( char* octs, int len){
@@ -1717,21 +1699,8 @@ BDecComponentUniversalString ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len
                return LDAP_DECODING_ERROR;
        }
        k->value = result;
+       k->comp_desc = get_component_description (BASICTYPE_UNIVERSAL_STR);
 
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentUniversalString;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentUniversalString;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentUniversalString;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_UNIVERSAL_STR;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentUniversalString;
        return LDAP_SUCCESS;
 }
 
@@ -1768,28 +1737,46 @@ BDecComponentVisibleString ( void* mem_op, GenBuf *b, AsnTag tagId, AsnLen len,
                rc = BDecVisibleStringContent ( mem_op, b, tagId, len, &result, bytesDecoded );
        }
        k->value = result;
+       k->comp_desc = get_component_description (BASICTYPE_VISIBLE_STR);
 
-        k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
-       if ( !k->comp_desc )  {
-               if ( k ) CompFree ( mem_op, k );
-               return LDAP_DECODING_ERROR;
-       }
-        k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentVisibleString;
-        k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentVisibleString;
-       k->comp_desc->cd_free = (comp_free_func*)FreeComponentVisibleString;
-       k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-       k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
-        k->comp_desc->cd_extract_i = NULL;
-        k->comp_desc->cd_type = ASN_BASIC;
-        k->comp_desc->cd_type_id = BASICTYPE_VISIBLE_STR;
-        k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentVisibleString;
        return LDAP_SUCCESS;
 }
 
 /*
  * Routines for handling an ANY DEFINED Type
  */
-void
+
+/* Check if the <select> type CR and the OID of the given ANY type */
+int
+CheckSelectTypeCorrect ( void* mem_op, ComponentAnyInfo* cai, struct berval* select ) {
+       int strLen;
+       AttributeType* ad_type;
+       char* oid;
+       char* result;
+
+       if ( IsNumericOid ( select->bv_val , select->bv_len ) ) {
+               oid = select->bv_val;
+               strLen = select->bv_len;
+       } else {
+               ad_type = at_bvfind( select );
+
+               if ( !ad_type )
+                       return LDAP_DECODING_ERROR;
+
+               oid = ad_type->sat_atype.at_oid;
+               strLen = strlen ( oid );
+       }
+       result = EncodeComponentOid ( mem_op, oid , &strLen );
+       if ( !result || strLen <= 0 ) return (-1);
+
+       if ( cai->oid.octetLen == strLen &&
+               strncmp ( cai->oid.octs, result, strLen ) == 0 )
+               return (1);
+       else
+               return (-1);
+}
+
+int
 SetAnyTypeByComponentOid ( ComponentAny *v, ComponentOid *id ) {
        Hash hash;
        void *anyInfo;
@@ -1807,6 +1794,7 @@ SetAnyTypeByComponentOid ( ComponentAny *v, ComponentOid *id ) {
         * Yet-to-be-Implemented
         */
        }
+       return LDAP_SUCCESS;
 }
 
 void
@@ -1822,10 +1810,22 @@ SetAnyTypeByComponentInt( ComponentAny *v, ComponentInt id) {
 }
 
 int
-BDecComponentAny ( void* mem_op, GenBuf *b, ComponentAny *result, AsnLen *bytesDecoded, int mode) {
+GEncComponentAny ( GenBuf *b, ComponentAny *in )
+{
+       if ( in->cai != NULL  && in->cai->Encode != NULL )
+               return in->cai->Encode(b, &in->value );
+       else
+               return (-1);
+}
+
+int
+BEncComponentAny ( void* mem_op, GenBuf *b, ComponentAny *result, AsnLen *bytesDecoded, int mode)
+{
         ComponentAny *k, **k2;
                                                                           
         k = (ComponentAny*) result;
+
+       if ( !k ) return (-1);
                                                                           
         if ( mode & DEC_ALLOC_MODE_0 ) {
                 k2 = (ComponentAny**) result;
@@ -1844,11 +1844,50 @@ BDecComponentAny ( void* mem_op, GenBuf *b, ComponentAny *result, AsnLen *bytesD
                        if ( k ) CompFree ( mem_op, k );
                        return LDAP_DECODING_ERROR;
                }
+               k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentAny;
+               k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentAny;
+               k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentAny;
+               k->comp_desc->cd_free = (comp_free_func*)FreeComponentAny;
+               k->comp_desc->cd_extract_i = NULL;
+               k->comp_desc->cd_type = ASN_BASIC;
+               k->comp_desc->cd_type_id = BASICTYPE_ANY;
+               k->comp_desc->cd_all_match = (allcomponent_matching_func*)MatchingComponentAny;
+               return LDAP_SUCCESS;
+       }
+       else {
+               Asn1Error ("ERROR - Component ANY Decode routine is NULL\n");
+               return 0;
+       }
+}
+
+int
+BDecComponentAny ( void* mem_op, GenBuf *b, ComponentAny *result, AsnLen *bytesDecoded, int mode) {
+       int rc;
+        ComponentAny *k, **k2;
+                                                                          
+        k = (ComponentAny*) result;
+
+       if ( !k ) return (-1);
+                                                                          
+        if ( mode & DEC_ALLOC_MODE_0 ) {
+                k2 = (ComponentAny**) result;
+                *k2 = (ComponentAny*) CompAlloc( mem_op, sizeof( ComponentAny ) );
+               if ( !*k2 ) return LDAP_DECODING_ERROR;
+                k = *k2;
+        }
+       
+       if ((result->cai != NULL) && (result->cai->BER_Decode != NULL)) {
+               result->cai->BER_Decode ( mem_op, b, (ComponentSyntaxInfo*)&result->value, (int*)bytesDecoded, DEC_ALLOC_MODE_0 );
+
+               k->comp_desc = CompAlloc( mem_op, sizeof( ComponentDesc ) );
+               if ( !k->comp_desc )  {
+                       if ( k ) CompFree ( mem_op, k );
+                       return LDAP_DECODING_ERROR;
+               }
+               k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentAny;
                k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentAny;
                k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentAny;
                k->comp_desc->cd_free = (comp_free_func*)FreeComponentAny;
-               k->comp_desc->cd_pretty = (slap_syntax_transform_func*)NULL;
-               k->comp_desc->cd_validate = (slap_syntax_validate_func*)NULL;
                k->comp_desc->cd_extract_i = NULL;
                k->comp_desc->cd_type = ASN_BASIC;
                k->comp_desc->cd_type_id = BASICTYPE_ANY;
@@ -1882,6 +1921,7 @@ GDecComponentAny ( void* mem_op, GenBuf *b, ComponentAny *result, AsnLen *bytesD
                        if ( k ) CompFree ( mem_op, k );
                        return LDAP_DECODING_ERROR;
                }
+               k->comp_desc->cd_gser_encoder = (encoder_func*)GEncComponentAny;
                k->comp_desc->cd_gser_decoder = (gser_decoder_func*)GDecComponentAny;
                k->comp_desc->cd_ber_decoder = (ber_decoder_func*)BDecComponentAny;
                k->comp_desc->cd_free = (comp_free_func*)FreeComponentAny;
@@ -1980,6 +2020,112 @@ InstallAnyByComponentInt (int anyId, ComponentInt intId, unsigned int size,
                Insert(anyIntHashTblG, a, h);
 }
 
+
+/*
+ * OID and its corresponding decoder can be registerd with this func.
+ * If contained types constrained by <select> are used,
+ * their OID and decoder MUST be registered, otherwise it will return no entry.
+ * An open type(ANY type) also need be registered.
+ */
+void
+InstallOidDecoderMapping ( char* ch_oid, EncodeFcn encode, gser_decoder_func* G_decode, ber_tag_decoder_func* B_decode, ExtractFcn extract, MatchFcn match ) {
+       AsnOid oid;
+       int strLen;
+       void* mem_op;
+
+       strLen = strlen( ch_oid );
+       if( strLen <= 0 ) return;
+       mem_op = comp_nibble_memory_allocator ( 128, 16 );
+       oid.octs = EncodeComponentOid ( mem_op, ch_oid, &strLen );
+       oid.octetLen = strLen;
+       if( strLen <= 0 ) return;
+       
+
+       InstallAnyByComponentOid ( 0, &oid, 0, encode, G_decode, B_decode,
+                                               extract, match, NULL, NULL);
+       comp_nibble_memory_free(mem_op);
+}
+
+/*
+ * Look up Oid-decoder mapping table by berval have either
+ * oid or description
+ */
+OidDecoderMapping*
+RetrieveOidDecoderMappingbyBV( struct berval* in ) {
+       if ( IsNumericOid ( in->bv_val, in->bv_len ) )
+               return RetrieveOidDecoderMappingbyOid( in->bv_val, in->bv_len );
+       else
+               return RetrieveOidDecoderMappingbyDesc( in->bv_val, in->bv_len );
+}
+
+/*
+ * Look up Oid-decoder mapping table by dotted OID
+ */
+OidDecoderMapping*
+RetrieveOidDecoderMappingbyOid( char* ch_oid, int oid_len ) {
+       Hash hash;
+       void *anyInfo;
+       AsnOid oid;
+       int strLen;
+       void* mem_op;
+
+       mem_op = comp_nibble_memory_allocator ( 128, 16 );
+       oid.octs = EncodeComponentOid ( mem_op, ch_oid, &oid_len);
+       oid.octetLen = oid_len;
+       if( oid_len <= 0 ) {
+               comp_nibble_memory_free( mem_op );
+               return NULL;
+       }
+       
+       /* use encoded oid as hash string */
+       hash = MakeHash ( oid.octs, oid.octetLen);
+       comp_nibble_memory_free( mem_op );
+       if (CheckForAndReturnValue (anyOidHashTblG, hash, &anyInfo))
+               return (OidDecoderMapping*) anyInfo;
+       else
+               return (OidDecoderMapping*) NULL;
+
+}
+
+/*
+ * Look up Oid-decoder mapping table by description
+ */
+OidDecoderMapping*
+RetrieveOidDecoderMappingbyDesc( char* desc, int desc_len ) {
+       Hash hash;
+       void *anyInfo;
+       AsnOid oid;
+       AttributeType* ad_type;
+       struct berval bv;
+       void* mem_op;
+
+       bv.bv_val = desc;
+       bv.bv_len = desc_len;
+       ad_type = at_bvfind( &bv );
+
+       oid.octs = ad_type->sat_atype.at_oid;
+       oid.octetLen = strlen ( oid.octs );
+
+       if ( !ad_type )
+               return (OidDecoderMapping*) NULL;
+
+       mem_op = comp_nibble_memory_allocator ( 128, 16 );
+
+       oid.octs = EncodeComponentOid ( mem_op, oid.octs , (int*)&oid.octetLen );
+       if( oid.octetLen <= 0 ) {
+               comp_nibble_memory_free( mem_op );
+               return (OidDecoderMapping*) NULL;
+       }
+       
+       /* use encoded oid as hash string */
+       hash = MakeHash ( oid.octs, oid.octetLen);
+       comp_nibble_memory_free( mem_op );
+       if (CheckForAndReturnValue (anyOidHashTblG, hash, &anyInfo))
+               return (OidDecoderMapping*) anyInfo;
+       else
+               return (OidDecoderMapping*) NULL;
+
+}
 void
 InstallAnyByComponentOid (int anyId, AsnOid *oid, unsigned int size,
                        EncodeFcn encode, gser_decoder_func* G_decode,
@@ -1991,8 +2137,11 @@ InstallAnyByComponentOid (int anyId, AsnOid *oid, unsigned int size,
 
        a = (ComponentAnyInfo*) malloc (sizeof (ComponentAnyInfo));
        a->anyId = anyId;
-       a->oid.octs = NULL;
-       a->oid.octetLen = 0;
+       if ( oid ) {
+               a->oid.octs = malloc( oid->octetLen );
+               memcpy ( a->oid.octs, oid->octs, oid->octetLen );
+               a->oid.octetLen = oid->octetLen;
+       }
        a->size = size;
        a->Encode = encode;
        a->GSER_Decode = G_decode;
@@ -2023,12 +2172,199 @@ AsnLen *bytesDecoded _AND_
 int mode) {
        tag = BDecTag ( b, bytesDecoded );
        elmtLen = BDecLen ( b, bytesDecoded );
+       if ( elmtLen <= 0 ) return (-1);
        if ( tag != MAKE_TAG_ID (UNIV, CONS, SEQ_TAG_CODE) ) {
-               printf("Invliad Tag\n");
-               exit (1);
+               return (-1);
        }
                
        return (*decoder)( mem_op, b, tag, elmtLen, (ComponentSyntaxInfo*)v,(int*)bytesDecoded, mode );
 }
 
+/*
+ * ASN.1 specification of a distinguished name
+ * DistinguishedName ::= RDNSequence
+ * RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
+ * RelativeDistinguishedName ::= SET SIZE(1..MAX) OF AttributeTypeandValue
+ * AttributeTypeandValue ::= SEQUENCE {
+ *     type    AttributeType
+ *     value   AttributeValue
+ * }
+ * When dnMatch/rdnMatch is used in a component assertion value
+ * the component in DistinguishedName/RelativeDistinguishedName
+ * need to be converted to the LDAP encodings in RFC2253
+ * in order to be matched against the assertion value
+ * If allComponentMatch is used, the assertion value may be
+ * decoded into the Internal Representation(Component Tree)
+ * by the corresponding GSER or BER decoder
+ * Following routine converts a component tree(DistinguishedName) into
+ * LDAP encodings in RFC2253
+ * Example)
+ * IR : ComponentRDNSequence
+ * GSER : { { type cn, value sang },{ type o, value ibm}, {type c, value us} }
+ * LDAP Encodings : cn=sang,o=ibm,c=us 
+ */
+
+increment_bv_mem_by_size ( struct berval* in, int size ) {
+       int new_size = in->bv_len + size;
+       in->bv_val = realloc( in->bv_val, new_size );
+       in->bv_len = new_size;
+}
+
+int
+ConvertBER2Desc( char* in, int size, struct berval* out, int* pos ) {
+       int desc_size;
+       char* desc_ptr;
+       unsigned int firstArcNum;
+       unsigned int arcNum;
+       int i, rc, start_pos = *pos;
+       char buf[MAX_OID_LEN];
+       AttributeType *at;
+       struct berval bv_name;
+
+       /*convert BER oid to desc*/
+       for ( i = 0, arcNum = 0; (i < size) && (in[i] & 0x80 ); i++ )
+               arcNum = (arcNum << 7) + (in[i] & 0x7f);
+       arcNum = (arcNum << 7) + (in[i] & 0x7f);
+       i++;
+       firstArcNum = (unsigned short)(arcNum/40);
+       if ( firstArcNum > 2 )
+               firstArcNum = 2;
+       
+       arcNum = arcNum - (firstArcNum * 40 );
+
+       rc = intToAscii ( arcNum, buf );
+
+       /*check if the buffer can store the first/second arc and two dots*/
+       if ( out->bv_len < *pos + 2 + 1 + rc )
+               increment_bv_mem_by_size ( out, INCREMENT_SIZE );
+
+       if ( firstArcNum == 1)
+               out->bv_val[*pos] = '1';
+       else
+               out->bv_val[*pos] = '2';
+       (*pos)++;
+       out->bv_val[*pos] = '.';
+       (*pos)++;
+
+       memcpy( out->bv_val + *pos, buf, rc );
+       *pos += rc;
+       out->bv_val[*pos] = '.';
+       (*pos)++;
+
+       for ( ; i < size ; ) {
+               for ( arcNum=0; (i < size) && (in[i] & 0x80) ; i++ )
+                       arcNum = (arcNum << 7) + (in[i] & 0x7f);
+               arcNum = (arcNum << 7) + (in[i] & 0x7f);
+               i++;
+
+               rc = intToAscii ( arcNum, buf );
+
+               if ( out->bv_len < *pos + rc + 1 )
+                       increment_bv_mem_by_size ( out, INCREMENT_SIZE );
+
+               memcpy( out->bv_val + *pos, buf, rc );
+               *pos += rc;
+               out->bv_val[*pos] = '.';
+               (*pos)++;
+       }
+       (*pos)--;/*remove the last '.'*/
+
+       /*
+        * lookup OID database to locate desc
+        * then overwrite OID with desc in *out
+        * If failed to look up desc, OID form is used
+        */
+       bv_name.bv_val = out->bv_val + start_pos;
+       bv_name.bv_len = *pos - start_pos;
+       at = at_bvfind( &bv_name );
+       if ( !at )
+               return LDAP_SUCCESS;
+       desc_size = at->sat_cname.bv_len;
+       memcpy( out->bv_val + start_pos, at->sat_cname.bv_val, desc_size );
+       *pos = start_pos + desc_size;
+       return LDAP_SUCCESS;
+}
+
+int
+ConvertComponentAttributeTypeAndValue2RFC2253 ( irAttributeTypeAndValue* in, struct berval* out, int *pos ) {
+       int rc;
+       int value_size = ((ComponentUTF8String*)in->value.value)->value.octetLen;
+       char* value_ptr =  ((ComponentUTF8String*)in->value.value)->value.octs;
+
+       rc = ConvertBER2Desc( in->type.value.octs, in->type.value.octetLen, out, pos );
+       if ( rc != LDAP_SUCCESS ) return rc;
+       if ( out->bv_len < *pos + 1/*for '='*/  )
+               increment_bv_mem_by_size ( out, INCREMENT_SIZE );
+       /*Between type and value, put '='*/
+       out->bv_val[*pos] = '=';
+       (*pos)++;
+
+       /*Assume it is string*/         
+       if ( out->bv_len < *pos + value_size )
+               increment_bv_mem_by_size ( out, INCREMENT_SIZE );
+       memcpy( out->bv_val + *pos, value_ptr, value_size );
+       out->bv_len += value_size;
+       *pos += value_size;
+       
+       return LDAP_SUCCESS;
+}
+
+int
+ConvertRelativeDistinguishedName2RFC2253 ( irRelativeDistinguishedName* in, struct berval *out , int* pos) {
+       irAttributeTypeAndValue* attr_typeNvalue;
+       int rc;
+
+
+       FOR_EACH_LIST_ELMT( attr_typeNvalue, &in->comp_list)
+       {
+               rc = ConvertComponentAttributeTypeAndValue2RFC2253( attr_typeNvalue, out, pos );
+               if ( rc != LDAP_SUCCESS ) return LDAP_INVALID_SYNTAX;
+
+               if ( out->bv_len < *pos + 1/*for '+'*/  )
+                       increment_bv_mem_by_size ( out, INCREMENT_SIZE );
+               /*between multivalued RDNs, put comma*/
+               out->bv_val[(*pos)++] = '+';
+       }
+       (*pos)--;/*remove the last '+'*/
+       return LDAP_SUCCESS;
+}
+
+int 
+ConvertRDN2RFC2253 ( irRelativeDistinguishedName* in, struct berval *out ) {
+       int rc, pos = 0;
+       out->bv_val = (char*)malloc( INITIAL_DN_SIZE );
+       out->bv_len = INITIAL_DN_SIZE;
+
+       rc = ConvertRelativeDistinguishedName2RFC2253 ( in, out , &pos);
+       if ( rc != LDAP_SUCCESS ) return rc;
+       out->bv_val[pos] = '\0';
+       out->bv_len = pos;
+       return LDAP_SUCCESS;
+}
+
+int
+ConvertRDNSequence2RFC2253( irRDNSequence *in, struct berval* out ) {
+       irRelativeDistinguishedName* rdn_seq;
+       AsnList* seq = &in->comp_list;
+       int pos = 0, rc ;
+
+       out->bv_val = (char*)malloc( INITIAL_DN_SIZE );
+       out->bv_len = INITIAL_DN_SIZE;
+
+       FOR_EACH_LIST_ELMT( rdn_seq, seq )
+       {
+               rc = ConvertRelativeDistinguishedName2RFC2253( rdn_seq, out, &pos );
+               if ( rc != LDAP_SUCCESS ) return LDAP_INVALID_SYNTAX;
+
+               if ( out->bv_len < pos + 1/*for ','*/ )
+                       increment_bv_mem_by_size ( out, INCREMENT_SIZE );
+               /*Between RDN, put comma*/
+               out->bv_val[pos++] = ',';
+       }
+       pos--;/*remove the last '+'*/
+       out->bv_val[pos] = '\0';
+       out->bv_len =pos;
+       return LDAP_SUCCESS;
+}
+
 #endif