X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=642decbc88d850bc63855f95d17e01595b4f307c;hb=62b6b326338d5162b0f570eaeb8a227fbc5a9c62;hp=5ab1467bc147da11f34c90817f2750edd2a32121;hpb=51849d6ecb17283c3539ac8a7cf2ec1f9d2fc808;p=openldap
diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 5ab1467bc1..642decbc88 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -1,13 +1,17 @@
+/* root_dse.c - Provides the Root DSA-Specific Entry */
/* $OpenLDAP$ */
-/* root_dse.c - Provides the ROOT DSA-Specific Entry
+/* This work is part of OpenLDAP Software .
*
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
* All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License. A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -21,15 +25,20 @@
#include "lber_pvt.h"
#ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
#endif
static struct berval supportedFeatures[] = {
- BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* all Operational Attributes ("+") */
- BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */
- BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */
+ 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_RANGE_OPTIONS),/* Language Range Options */
+
+#ifdef LDAP_DEVEL
+ BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
+ BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
+#endif
{0,NULL}
};
@@ -43,9 +52,7 @@ root_dse_info(
{
Entry *e;
struct berval vals[2], *bv;
-#ifdef SLAP_NVALUES
struct berval nvals[2];
-#endif
int i, j;
char ** supportedSASLMechanisms;
@@ -69,20 +76,13 @@ root_dse_info(
= slap_schema.si_ad_ref;
vals[1].bv_val = NULL;
-#ifdef SLAP_NVALUES
nvals[1].bv_val = NULL;
-#endif
e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
if( e == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
-#endif
return LDAP_OTHER;
}
@@ -100,39 +100,29 @@ root_dse_info(
vals[0].bv_val = "top";
vals[0].bv_len = sizeof("top")-1;
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_objectClass, vals, vals ) )
-#else
- if( attr_merge( e, ad_objectClass, vals ) )
-#endif
- {
+ if( attr_merge( e, ad_objectClass, vals, NULL ) ) {
return LDAP_OTHER;
}
vals[0].bv_val = "OpenLDAProotDSE";
vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_objectClass, vals, vals ) )
-#else
- if( attr_merge( e, ad_objectClass, vals ) )
-#endif
+ if( attr_merge( e, ad_objectClass, vals, NULL ) ) {
return LDAP_OTHER;
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_structuralObjectClass, vals, vals ) )
-#else
- if( attr_merge( e, ad_structuralObjectClass, vals ) )
-#endif
+ }
+ if( attr_merge( e, ad_structuralObjectClass, vals, NULL ) ) {
return LDAP_OTHER;
+ }
for ( i = 0; i < nbackends; i++ ) {
- if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+ if ( backends[i].be_suffix == NULL
+ || backends[i].be_nsuffix == NULL ) {
+ /* no suffix! */
+ continue;
+ }
+ if ( SLAP_MONITOR( &backends[i] )) {
vals[0] = backends[i].be_suffix[0];
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_monitorContext, vals, nvals ) )
-#else
- if( attr_merge( e, ad_monitorContext, vals ) )
-#endif
- {
+ nvals[0] = backends[i].be_nsuffix[0];
+ if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {
return LDAP_OTHER;
}
continue;
@@ -142,12 +132,8 @@ root_dse_info(
}
for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
vals[0] = backends[i].be_suffix[j];
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_namingContexts, vals, NULL ) )
-#else
- if( attr_merge( e, ad_namingContexts, vals ) )
-#endif
- {
+ nvals[0] = backends[i].be_nsuffix[0];
+ if( attr_merge( e, ad_namingContexts, vals, nvals ) ) {
return LDAP_OTHER;
}
}
@@ -161,41 +147,22 @@ root_dse_info(
}
/* supportedExtension */
- for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
- vals[0] = *bv;
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_supportedExtension, vals, NULL ) )
-#else
- if( attr_merge( e, ad_supportedExtension, vals ) )
-#endif
- {
- return LDAP_OTHER;
- }
+ if ( exop_root_dse_info( e ) != 0 ) {
+ return LDAP_OTHER;
}
#ifdef LDAP_SLAPI
/* netscape supportedExtension */
- for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
+ for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
vals[0] = *bv;
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_supportedExtension, vals, NULL ))
-#else
- if( attr_merge( e, ad_supportedExtension, vals ))
-#endif
- {
+ if( attr_merge( e, ad_supportedExtension, vals, NULL )) {
return LDAP_OTHER;
}
}
#endif /* LDAP_SLAPI */
/* supportedFeatures */
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_supportedFeatures,
- supportedFeatures, supportedFeatures ) )
-#else
- if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
-#endif
- {
+ if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {
return LDAP_OTHER;
}
@@ -211,12 +178,7 @@ root_dse_info(
snprintf(buf, sizeof buf, "%d", i);
vals[0].bv_val = buf;
vals[0].bv_len = strlen( vals[0].bv_val );
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) )
-#else
- if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
-#endif
- {
+ if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) ) {
return LDAP_OTHER;
}
}
@@ -228,12 +190,7 @@ root_dse_info(
for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
vals[0].bv_val = supportedSASLMechanisms[i];
vals[0].bv_len = strlen( vals[0].bv_val );
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) )
-#else
- if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
-#endif
- {
+ if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) ) {
return LDAP_OTHER;
}
}
@@ -241,12 +198,7 @@ root_dse_info(
}
if ( default_referral != NULL ) {
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) )
-#else
- if( attr_merge( e, ad_ref, default_referral ) )
-#endif
- {
+ if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
return LDAP_OTHER;
}
}
@@ -254,11 +206,8 @@ root_dse_info(
if( usr_attr != NULL) {
Attribute *a;
for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
-#ifdef SLAP_NVALUES
- if( attr_merge( e, a->a_desc, a->a_vals, a->a_nvals ) )
-#else
- if( attr_merge( e, a->a_desc, a->a_vals ) )
-#endif
+ if( attr_merge( e, a->a_desc, a->a_vals,
+ (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
{
return LDAP_OTHER;
}
@@ -291,13 +240,9 @@ int read_root_dse_file( const char *fname )
usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
if( usr_attr == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
-#endif
+ fclose( fp );
return LDAP_OTHER;
}
usr_attr->e_attrs = NULL;
@@ -309,9 +254,8 @@ int read_root_dse_file( const char *fname )
if( e == NULL ) {
fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",
lineno );
- entry_free( usr_attr );
- usr_attr = NULL;
- return EXIT_FAILURE;
+ rc = EXIT_FAILURE;
+ break;
}
/* make sure the DN is the empty DN */
@@ -320,9 +264,8 @@ int read_root_dse_file( const char *fname )
"root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n",
e->e_dn, lineno );
entry_free( e );
- entry_free( usr_attr );
- usr_attr = NULL;
- return EXIT_FAILURE;
+ rc = EXIT_FAILURE;
+ break;
}
/*
@@ -332,21 +275,27 @@ int read_root_dse_file( const char *fname )
*/
for(a = e->e_attrs; a != NULL; a = a->a_next) {
-#ifdef SLAP_NVALUES
- if( attr_merge( usr_attr, a->a_desc, a->a_vals, a->a_nvals ) )
-#else
- if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
-#endif
+ if( attr_merge( usr_attr, a->a_desc, a->a_vals,
+ (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
{
- return LDAP_OTHER;
+ rc = LDAP_OTHER;
+ break;
}
}
entry_free( e );
+ if (rc) break;
+ }
+
+ if (rc) {
+ entry_free( usr_attr );
+ usr_attr = NULL;
}
ch_free( buf );
+ fclose( fp );
+
Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
return rc;
}