Use recursive mutex to avoid deadlocks

[openldap] / servers / slapd / schema_init.c

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 9b46a5ef93845c5ef93abf8fe3c9556eda6c1709..fe237767a4ec85d2adb273a7b599d26ca296eafa 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -67,10 +67,8 @@
 #define csnIndexer                             generalizedTimeIndexer
 #define csnFilter                              generalizedTimeFilter
 
-#ifdef SLAP_AUTHZ_SYNTAX
 /* FIXME: temporary */
 #define authzMatch                             octetStringMatch
-#endif /* SLAP_AUTHZ_SYNTAX */
 
 unsigned int index_substr_if_minlen = SLAP_INDEX_SUBSTR_IF_MINLEN_DEFAULT;
 unsigned int index_substr_if_maxlen = SLAP_INDEX_SUBSTR_IF_MAXLEN_DEFAULT;
@@ -1010,7 +1008,7 @@ uniqueMemberNormalize(
        struct berval out;
        int rc;
 
-       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ));
+       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ) != 0 );
 
        ber_dupbv_x( &out, val, ctx );
        if ( BER_BVISEMPTY( &out ) ) {
@@ -1423,7 +1421,7 @@ UTF8StringNormalize(
        int flags;
        int i, wasspace;
 
-       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ));
+       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ) != 0 );
 
        if( BER_BVISNULL( val ) ) {
                /* assume we're dealing with a syntax (e.g., UTF8String)
@@ -1854,7 +1852,7 @@ telephoneNumberNormalize(
 {
        char *p, *q;
 
-       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ));
+       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( usage ) != 0 );
 
        /* validator should have refused an empty string */
        assert( !BER_BVISEMPTY( val ) );
@@ -2106,7 +2104,7 @@ IA5StringNormalize(
 
        assert( !BER_BVISEMPTY( val ) );
 
-       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ));
+       assert( SLAP_MR_IS_VALUE_OF_SYNTAX( use ) != 0 );
 
        p = val->bv_val;
 
@@ -3275,7 +3273,7 @@ certificateExactNormalize(
                return serialNumberAndIssuerNormalize(0,NULL,NULL,val,normalized,ctx);
        }
 
-       assert( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX(usage) );
+       assert( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX(usage) != 0 );
 
        p = (unsigned char *)val->bv_val;
        xcert = d2i_X509( NULL, &p, val->bv_len);
@@ -4146,11 +4144,23 @@ static slap_syntax_defs_rec syntax_defs[] = {
        {"( 1.3.6.1.1.1.0.1  DESC 'RFC2307 Boot Parameter' )",
                0, bootParameterValidate, NULL},
 
-       /* From PKIX *//* This OID is not published yet. */
-       {"( 1.2.826.0.1.3344810.7.1 DESC 'Certificate Serial Number and Issuer' )",
+       /* draft-zeilenga-ldap-x509 */
+       {"( 1.3.6.1.1.15.1 DESC 'Certificate Exact Assertion' )",
                SLAP_SYNTAX_HIDE,
                serialNumberAndIssuerValidate,
                serialNumberAndIssuerPretty},
+       {"( 1.3.6.1.1.15.2 DESC 'Certificate Assertion' )",
+               SLAP_SYNTAX_HIDE, NULL, NULL},
+       {"( 1.3.6.1.1.15.3 DESC 'Certificate Pair Exact Assertion' )",
+               SLAP_SYNTAX_HIDE, NULL, NULL},
+       {"( 1.3.6.1.1.15.4 DESC 'Certificate Pair Assertion' )",
+               SLAP_SYNTAX_HIDE, NULL, NULL},
+       {"( 1.3.6.1.1.15.5 DESC 'Certificate List Exact Assertion' )",
+               SLAP_SYNTAX_HIDE, NULL, NULL},
+       {"( 1.3.6.1.1.15.6 DESC 'Certificate List Assertion' )",
+               SLAP_SYNTAX_HIDE, NULL, NULL},
+       {"( 1.3.6.1.1.15.7 DESC 'Algorithm Identifier' )",
+               SLAP_SYNTAX_HIDE, NULL, NULL},
 
 #ifdef SLAPD_AUTHPASSWD
        /* needs updating */
@@ -4168,11 +4178,9 @@ static slap_syntax_defs_rec syntax_defs[] = {
        {"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' )" ,
                SLAP_SYNTAX_HIDE, inValidate, NULL},
 
-#ifdef SLAP_AUTHZ_SYNTAX
        /* FIXME: OID is unused, but not registered yet */
        {"( 1.3.6.1.4.1.4203.666.2.7 DESC 'OpenLDAP authz' )",
                SLAP_SYNTAX_HIDE, authzValidate, authzPretty},
-#endif /* SLAP_AUTHZ_SYNTAX */
 
        {NULL, 0, NULL, NULL}
 };
@@ -4216,17 +4224,18 @@ char *objectIdentifierFirstComponentMatchSyntaxes[] = {
  * 2.5.13.31*  directoryStringFirstComponentMatch
  * 2.5.13.32*  wordMatch
  * 2.5.13.33*  keywordMatch
- * 2.5.13.36   certificatePairExactMatch
- * 2.5.13.37   certificatePairMatch
- * 2.5.13.38   certificateListExactMatch
- * 2.5.13.39   certificateListMatch
- * 2.5.13.40   algorithmIdentifierMatch
+ * 2.5.13.36+  certificatePairExactMatch
+ * 2.5.13.37+  certificatePairMatch
+ * 2.5.13.38+  certificateListExactMatch
+ * 2.5.13.39+  certificateListMatch
+ * 2.5.13.40+  algorithmIdentifierMatch
  * 2.5.13.41*  storedPrefixMatch
  * 2.5.13.42   attributeCertificateMatch
  * 2.5.13.43   readerAndKeyIDMatch
  * 2.5.13.44   attributeIntegrityMatch
  *
  * (*) described in RFC 3698 (LDAP: Additional Matching Rules)
+ * (+) described in draft-zeilenga-ldap-x509
  */
 static slap_mrule_defs_rec mrule_defs[] = {
        /*
@@ -4509,7 +4518,7 @@ static slap_mrule_defs_rec mrule_defs[] = {
                NULL },
 
        {"( 2.5.13.34 NAME 'certificateExactMatch' "
-               "SYNTAX 1.2.826.0.1.3344810.7.1 )",
+               "SYNTAX 1.3.6.1.1.15.1 )",
                SLAP_MR_EQUALITY | SLAP_MR_EXT, certificateExactMatchSyntaxes,
 #ifdef HAVE_TLS
                NULL, certificateExactNormalize, octetStringMatch,
@@ -4520,7 +4529,7 @@ static slap_mrule_defs_rec mrule_defs[] = {
                NULL },
 
        {"( 2.5.13.35 NAME 'certificateMatch' "
-               "SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )",
+               "SYNTAX 1.3.6.1.1.15.2 )",
                SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
                NULL, NULL, NULL, NULL, NULL,
                NULL },
@@ -4605,7 +4614,6 @@ static slap_mrule_defs_rec mrule_defs[] = {
                NULL, NULL,
                "CSNMatch" },
 
-#ifdef SLAP_AUTHZ_SYNTAX
        /* FIXME: OID is unused, but not registered yet */
        {"( 1.3.6.1.4.1.4203.666.4.12 NAME 'authzMatch' "
                "SYNTAX 1.3.6.1.4.1.4203.666.2.7 )",
@@ -4613,7 +4621,6 @@ static slap_mrule_defs_rec mrule_defs[] = {
                NULL, authzNormalize, authzMatch,
                NULL, NULL,
                NULL},
-#endif /* SLAP_AUTHZ_SYNTAX */
 
        {NULL, SLAP_MR_NONE, NULL,
                NULL, NULL, NULL, NULL, NULL,
@@ -4674,6 +4681,8 @@ schema_destroy( void )
        mru_destroy();
        syn_destroy();
 
-       ldap_pvt_thread_mutex_destroy( &ad_undef_mutex );
-       ldap_pvt_thread_mutex_destroy( &oc_undef_mutex );
+       if( schema_init_done ) {
+               ldap_pvt_thread_mutex_destroy( &ad_undef_mutex );
+               ldap_pvt_thread_mutex_destroy( &oc_undef_mutex );
+       }
 }