Use recursive mutex to avoid deadlocks

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 810c5316c0c823e57500e96748d7157dab463d22..356cbc78a68182b7c59ac41ae7c6bc2bcf4ca2fd 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,21 +28,153 @@
 #include "slapi/slapi.h"
 #endif
 
-static struct berval supportedFeatures[] = {
+static struct berval   builtin_supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
-       BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),                     /* All Op Attrs (+) */
+       BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),             /* All Op Attrs (+) */
        BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS),        /* OCs in Attrs List (@class) */
        BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
-       BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
-       BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),/* Language Range Options */
+       BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS),     /* Language Tag Options */
+       BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),   /* Language Range Options */
 #ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
        BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
 #endif
-       {0,NULL}
+       BER_BVNULL
 };
+static struct berval   *supportedFeatures;
 
 static Entry   *usr_attr = NULL;
 
+/*
+ * allow modules to register functions that muck with the root DSE entry
+ */
+
+typedef struct entry_info_t {
+       SLAP_ENTRY_INFO_FN      func;
+       void                    *arg;
+       struct entry_info_t     *next;
+} entry_info_t;
+
+static entry_info_t *extra_info;
+
+int
+entry_info_register( SLAP_ENTRY_INFO_FN func, void *arg )
+{
+       entry_info_t    *ei = ch_calloc( 1, sizeof( entry_info_t ) );
+
+       ei->func = func;
+       ei->arg = arg;
+
+       ei->next = extra_info;
+       extra_info = ei;
+
+       return 0;
+}
+
+int
+entry_info_unregister( SLAP_ENTRY_INFO_FN func, void *arg )
+{
+       entry_info_t    **eip;
+
+       for ( eip = &extra_info; *eip != NULL; eip = &(*eip)->next ) {
+               if ( (*eip)->func == func && (*eip)->arg == arg ) {
+                       entry_info_t    *ei = *eip;
+
+                       *eip = ei->next;
+
+                       ch_free( ei );
+
+                       return 0;
+               }
+       }
+
+       return -1;
+}
+
+void
+entry_info_destroy( void )
+{
+       entry_info_t    **eip;
+
+       for ( eip = &extra_info; *eip != NULL;  ) {
+               entry_info_t    *ei = *eip;
+
+               eip = &(*eip)->next;
+
+               ch_free( ei );
+       }
+}
+
+/*
+ * Allow modules to register supported features
+ */
+
+static int
+supported_feature_init( void )
+{
+       int             i;
+
+       if ( supportedFeatures != NULL ) {
+               return 0;
+       }
+
+       for ( i = 0; !BER_BVISNULL( &builtin_supportedFeatures[ i ] ); i++ )
+               ;
+
+       supportedFeatures = ch_calloc( sizeof( struct berval ), i + 1 );
+       if ( supportedFeatures == NULL ) {
+               return -1;
+       }
+
+       for ( i = 0; !BER_BVISNULL( &builtin_supportedFeatures[ i ] ); i++ ) {
+               ber_dupbv( &supportedFeatures[ i ], &builtin_supportedFeatures[ i ] );
+       }
+       BER_BVZERO( &supportedFeatures[ i ] );
+
+       return 0;
+}
+
+int
+supported_feature_destroy( void )
+{
+       int             i;
+
+       if ( supportedFeatures == NULL ) {
+               return 0;
+       }
+       
+       for ( i = 0; !BER_BVISNULL( &supportedFeatures[ i ] ); i++ ) {
+               ch_free( supportedFeatures[ i ].bv_val );
+       }
+
+       ch_free( supportedFeatures );
+       supportedFeatures = NULL;
+
+       return 0;
+}
+
+int
+supported_feature_load( struct berval *f )
+{
+       struct berval   *tmp;
+       int             i;
+
+       supported_feature_init();
+
+       for ( i = 0; !BER_BVISNULL( &supportedFeatures[ i ] ); i++ )
+               ;
+
+       tmp = ch_realloc( supportedFeatures, sizeof( struct berval ) * ( i + 2 ) );
+       if ( tmp == NULL ) {
+               return -1;
+       }
+       supportedFeatures = tmp;
+
+       ber_dupbv( &supportedFeatures[ i ], f );
+       BER_BVZERO( &supportedFeatures[ i + 1 ] );
+
+       return 0;
+}
+
 int
 root_dse_info(
        Connection *conn,
@@ -82,7 +214,6 @@ root_dse_info(
                = slap_schema.si_ad_ref;
 
        e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
-
        if( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
@@ -101,6 +232,7 @@ root_dse_info(
 
        e->e_private = NULL;
 
+       /* FIXME: is this really needed? */
        BER_BVSTR( &val, "top" );
        if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) {
                return LDAP_OTHER;
@@ -173,6 +305,10 @@ root_dse_info(
 #endif /* LDAP_SLAPI */
 
        /* supportedFeatures */
+       if ( supportedFeatures == NULL ) {
+               supported_feature_init();
+       }
+
        if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {
                return LDAP_OTHER;
        }
@@ -224,6 +360,14 @@ root_dse_info(
                }
        }
 
+       if ( extra_info ) {
+               entry_info_t    *ei = extra_info;
+
+               for ( ; ei; ei = ei->next ) {
+                       ei->func( ei->arg, e );
+               }
+       }
+
        *entry = e;
        return LDAP_SUCCESS;
 }
@@ -333,7 +477,8 @@ slap_discover_feature(
                return rc;
        }
 
-       rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
+       rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION,
+               (const void *)&version );
        if ( rc != LDAP_SUCCESS ) {
                goto done;
        }