X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Froot_dse.c;h=64389ccd170d43bbebdc56d775e95c7c617214b2;hb=46fab059977aed107f53c96ced0f35cfff8c7836;hp=e7a80d0150cdc20b4864451c802f780d3e54c72e;hpb=8502301b006e170acbc4ae9ee7aa6871f9fc79f4;p=openldap
diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index e7a80d0150..64389ccd17 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-2005 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,21 @@
#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_FEATURE_SUBORDINATE_SCOPE
+ BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
+#endif
+#ifdef LDAP_FEATURE_MODIFY_INCREMENT
+ BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
+#endif
{0,NULL}
};
@@ -42,12 +52,11 @@ root_dse_info(
const char **text )
{
Entry *e;
- struct berval vals[2], *bv;
-#ifdef SLAP_NVALUES
- struct berval nvals[2];
-#endif
+ struct berval val, *bv;
+ struct berval nval;
int i, j;
char ** supportedSASLMechanisms;
+ BackendDB *be;
AttributeDescription *ad_structuralObjectClass
= slap_schema.si_ad_structuralObjectClass;
@@ -55,8 +64,6 @@ root_dse_info(
= slap_schema.si_ad_objectClass;
AttributeDescription *ad_namingContexts
= slap_schema.si_ad_namingContexts;
- AttributeDescription *ad_supportedControl
- = slap_schema.si_ad_supportedControl;
AttributeDescription *ad_supportedExtension
= slap_schema.si_ad_supportedExtension;
AttributeDescription *ad_supportedLDAPVersion
@@ -67,24 +74,16 @@ root_dse_info(
= slap_schema.si_ad_supportedFeatures;
AttributeDescription *ad_monitorContext
= slap_schema.si_ad_monitorContext;
+ AttributeDescription *ad_configContext
+ = slap_schema.si_ad_configContext;
AttributeDescription *ad_ref
= 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,55 +99,50 @@ root_dse_info(
e->e_private = NULL;
- 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
- {
+ BER_BVSTR( &val, "top" );
+ if( attr_merge_one( e, ad_objectClass, &val, 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
+ BER_BVSTR( &val, "OpenLDAProotDSE" );
+ if( attr_merge_one( e, ad_objectClass, &val, 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_one( e, ad_structuralObjectClass, &val, NULL ) ) {
return LDAP_OTHER;
+ }
- for ( i = 0; i < nbackends; i++ ) {
- if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
- 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
+ LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
+ if ( be->be_suffix == NULL
+ || be->be_nsuffix == NULL ) {
+ /* no suffix! */
+ continue;
+ }
+ if ( SLAP_MONITOR( be )) {
+ if( attr_merge_one( e, ad_monitorContext,
+ &be->be_suffix[0],
+ &be->be_nsuffix[0] ) )
{
return LDAP_OTHER;
}
continue;
}
- if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
+ if ( SLAP_CONFIG( be )) {
+ if( attr_merge_one( e, ad_configContext,
+ &be->be_suffix[0],
+ & be->be_nsuffix[0] ) )
+ {
+ return LDAP_OTHER;
+ }
continue;
}
- 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
+ if ( SLAP_GLUE_SUBORDINATE( be ) && !SLAP_GLUE_ADVERTISE( be ) ) {
+ continue;
+ }
+ for ( j = 0; be->be_suffix[j].bv_val != NULL; j++ ) {
+ if( attr_merge_one( e, ad_namingContexts,
+ &be->be_suffix[j],
+ &be->be_nsuffix[0] ) )
{
return LDAP_OTHER;
}
@@ -158,75 +152,41 @@ root_dse_info(
/* altServer unsupported */
/* supportedControl */
- for ( i=0; (vals[0].bv_val = get_supported_ctrl(i)) != NULL; i++ ) {
- vals[0].bv_len = strlen( vals[0].bv_val );
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_supportedControl, vals, NULL ) )
-#else
- if( attr_merge( e, ad_supportedControl, vals ) )
-#endif
- {
- return LDAP_OTHER;
- }
+ if ( controls_root_dse_info( e ) != 0 ) {
+ return LDAP_OTHER;
}
/* 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++ ) {
- vals[0] = *bv;
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_supportedExtension, vals, NULL ))
-#else
- if( attr_merge( e, ad_supportedExtension, vals ))
-#endif
- {
+ for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
+ if( attr_merge_one( e, ad_supportedExtension, bv, 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;
}
/* supportedLDAPVersion */
- for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {
+ /* don't publish version 2 as we don't really support it
+ * (even when configured to accept version 2 Bind requests)
+ * and the value would never be used by true LDAPv2 (or LDAPv3)
+ * clients.
+ */
+ for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) {
char buf[BUFSIZ];
- if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
- ( i < LDAP_VERSION3 ) )
- {
- /* version 2 and lower are disallowed */
- continue;
- }
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
- {
+ val.bv_val = buf;
+ val.bv_len = strlen( val.bv_val );
+ if( attr_merge_one( e, ad_supportedLDAPVersion, &val, NULL ) ) {
return LDAP_OTHER;
}
}
@@ -236,14 +196,9 @@ root_dse_info(
if( supportedSASLMechanisms != NULL ) {
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
- {
+ val.bv_val = supportedSASLMechanisms[i];
+ val.bv_len = strlen( val.bv_val );
+ if( attr_merge_one( e, ad_supportedSASLMechanisms, &val, NULL ) ) {
return LDAP_OTHER;
}
}
@@ -251,12 +206,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;
}
}
@@ -264,11 +214,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;
}
@@ -287,11 +234,11 @@ root_dse_info(
*/
int read_root_dse_file( const char *fname )
{
- FILE *fp;
+ struct LDIFFP *fp;
int rc = 0, lineno = 0, lmax = 0;
char *buf = NULL;
- if ( (fp = fopen( fname, "r" )) == NULL ) {
+ if ( (fp = ldif_open( fname, "r" )) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"could not open rootdse attr file \"%s\" - absolute path?\n",
fname, 0, 0 );
@@ -301,13 +248,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
+ ldif_close( fp );
return LDAP_OTHER;
}
usr_attr->e_attrs = NULL;
@@ -319,9 +262,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 */
@@ -330,9 +272,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;
}
/*
@@ -342,21 +283,102 @@ 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 );
+ ldif_close( fp );
+
Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
return rc;
}
+
+int
+slap_discover_feature(
+ const char *uri,
+ int version,
+ const char *attr,
+ const char *val )
+{
+ LDAP *ld;
+ LDAPMessage *res = NULL, *entry;
+ int rc, i;
+ struct berval cred = BER_BVC( "" ),
+ bv_val,
+ **values = NULL;
+ char *attrs[ 2 ] = { NULL, NULL };
+
+ ber_str2bv( val, 0, 0, &bv_val );
+ attrs[ 0 ] = (char *) attr;
+
+ rc = ldap_initialize( &ld, uri );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
+ if ( rc != LDAP_SUCCESS ) {
+ goto done;
+ }
+
+ rc = ldap_sasl_bind_s( ld, "", LDAP_SASL_SIMPLE,
+ &cred, NULL, NULL, NULL );
+ if ( rc != LDAP_SUCCESS ) {
+ goto done;
+ }
+
+ rc = ldap_search_ext_s( ld, "", LDAP_SCOPE_BASE, "(objectClass=*)",
+ attrs, 0, NULL, NULL, NULL, 0, &res );
+ if ( rc != LDAP_SUCCESS ) {
+ goto done;
+ }
+
+ entry = ldap_first_entry( ld, res );
+ if ( entry == NULL ) {
+ goto done;
+ }
+
+ values = ldap_get_values_len( ld, entry, attrs[ 0 ] );
+ if ( values == NULL ) {
+ rc = LDAP_NO_SUCH_ATTRIBUTE;
+ goto done;
+ }
+
+ for ( i = 0; values[ i ] != NULL; i++ ) {
+ if ( bvmatch( &bv_val, values[ i ] ) ) {
+ rc = LDAP_COMPARE_TRUE;
+ goto done;
+ }
+ }
+
+ rc = LDAP_COMPARE_FALSE;
+
+done:;
+ if ( values != NULL ) {
+ ldap_value_free_len( values );
+ }
+
+ if ( res != NULL ) {
+ ldap_msgfree( res );
+ }
+
+ ldap_unbind_ext( ld, NULL, NULL );
+
+ return rc;
+}
+