cleanup

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index a166feea9c737049bbf781417d26e94b7ce9a971..9be7f5399b90334ee92b748060d27f65ecbd1110 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
@@ -44,6 +44,70 @@ 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 )
 {
@@ -150,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 );
@@ -169,17 +232,20 @@ 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 ) ) {
+fail:
+               entry_free( e );
                return LDAP_OTHER;
        }
 
        BER_BVSTR( &val, "OpenLDAProotDSE" );
        if( attr_merge_one( e, ad_objectClass, &val, NULL ) ) {
-               return LDAP_OTHER;
+               goto fail;
        }
        if( attr_merge_one( e, ad_structuralObjectClass, &val, NULL ) ) {
-               return LDAP_OTHER;
+               goto fail;
        }
 
        LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
@@ -193,7 +259,7 @@ root_dse_info(
                                        &be->be_suffix[0],
                                        &be->be_nsuffix[0] ) )
                        {
-                               return LDAP_OTHER;
+                               goto fail;
                        }
                        continue;
                }
@@ -202,7 +268,7 @@ root_dse_info(
                                        &be->be_suffix[0],
                                        & be->be_nsuffix[0] ) )
                        {
-                               return LDAP_OTHER;
+                               goto fail;
                        }
                        continue;
                }
@@ -214,7 +280,7 @@ root_dse_info(
                                        &be->be_suffix[j],
                                        &be->be_nsuffix[0] ) )
                        {
-                               return LDAP_OTHER;
+                               goto fail;
                        }
                }
        }
@@ -223,19 +289,19 @@ root_dse_info(
 
        /* supportedControl */
        if ( controls_root_dse_info( e ) != 0 ) {
-               return LDAP_OTHER;
+               goto fail;
        }
 
        /* supportedExtension */
        if ( exop_root_dse_info( e ) != 0 ) {
-               return LDAP_OTHER;
+               goto fail;
        }
 
 #ifdef LDAP_SLAPI
        /* netscape supportedExtension */
        for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
                if( attr_merge_one( e, ad_supportedExtension, bv, NULL ) ) {
-                       return LDAP_OTHER;
+                       goto fail;
                }
        }
 #endif /* LDAP_SLAPI */
@@ -246,7 +312,7 @@ root_dse_info(
        }
 
        if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {
-               return LDAP_OTHER;
+               goto fail;
        }
 
        /* supportedLDAPVersion */
@@ -261,7 +327,7 @@ root_dse_info(
                val.bv_val = buf;
                val.bv_len = strlen( val.bv_val );
                if( attr_merge_one( e, ad_supportedLDAPVersion, &val, NULL ) ) {
-                       return LDAP_OTHER;
+                       goto fail;
                }
        }
 
@@ -273,7 +339,8 @@ root_dse_info(
                        val.bv_val = supportedSASLMechanisms[i];
                        val.bv_len = strlen( val.bv_val );
                        if( attr_merge_one( e, ad_supportedSASLMechanisms, &val, NULL ) ) {
-                               return LDAP_OTHER;
+                               ldap_charray_free( supportedSASLMechanisms );
+                               goto fail;
                        }
                }
                ldap_charray_free( supportedSASLMechanisms );
@@ -281,7 +348,7 @@ root_dse_info(
 
        if ( default_referral != NULL ) {
                if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
-                       return LDAP_OTHER;
+                       goto fail;
                }
        }
 
@@ -291,11 +358,19 @@ root_dse_info(
                        if( attr_merge( e, a->a_desc, a->a_vals,
                                (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
                        {
-                               return LDAP_OTHER;
+                               goto fail;
                        }
                }
        }
 
+       if ( extra_info ) {
+               entry_info_t    *ei = extra_info;
+
+               for ( ; ei; ei = ei->next ) {
+                       ei->func( ei->arg, e );
+               }
+       }
+
        *entry = e;
        return LDAP_SUCCESS;
 }
@@ -405,7 +480,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;
        }