/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
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 */
-#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
+#ifdef LDAP_DEVEL
BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE), /* "children" search scope */
#endif
BER_BVNULL
AttributeDescription *ad_ref
= slap_schema.si_ad_ref;
- e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
-
+ e = entry_alloc();
if( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
+ "root_dse_info: entry_alloc failed", 0, 0, 0 );
return LDAP_OTHER;
}
/* 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 ) {
&be->be_suffix[0],
&be->be_nsuffix[0] ) )
{
- return LDAP_OTHER;
+ goto fail;
}
continue;
}
&be->be_suffix[0],
& be->be_nsuffix[0] ) )
{
- return LDAP_OTHER;
+ goto fail;
}
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] ) )
+ &be->be_suffix[j], NULL ) )
{
- return LDAP_OTHER;
+ goto fail;
}
}
}
/* 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 */
}
if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {
- return LDAP_OTHER;
+ goto fail;
}
/* supportedLDAPVersion */
* clients.
*/
for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) {
- char buf[BUFSIZ];
+ char buf[sizeof("255")];
snprintf(buf, sizeof buf, "%d", i);
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;
}
}
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 );
if ( default_referral != NULL ) {
if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
- return LDAP_OTHER;
+ goto fail;
}
}
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;
}
}
}
return LDAP_SUCCESS;
}
+int
+root_dse_init( void )
+{
+ return 0;
+}
+
+int
+root_dse_destroy( void )
+{
+ if ( usr_attr ) {
+ entry_free( usr_attr );
+ usr_attr = NULL;
+ }
+
+ return 0;
+}
+
/*
* Read the entries specified in fname and merge the attributes
* to the user defined rootDSE. Note thaat if we find any errors
* what so ever, we will discard the entire entries, print an
* error message and return.
*/
-int read_root_dse_file( const char *fname )
+int
+root_dse_read_file( const char *fname )
{
struct LDIFFP *fp;
- int rc = 0, lineno = 0, lmax = 0;
+ int rc = 0, lmax = 0, ldifrc;
+ unsigned long lineno = 0;
char *buf = NULL;
if ( (fp = ldif_open( fname, "r" )) == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "could not open rootdse attr file \"%s\" - absolute path?\n",
+ "root_dse_read_file: could not open rootdse attr file \"%s\" - absolute path?\n",
fname, 0, 0 );
perror( fname );
return EXIT_FAILURE;
}
- usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+ usr_attr = entry_alloc();
if( usr_attr == NULL ) {
Debug( LDAP_DEBUG_ANY,
- "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
+ "root_dse_read_file: entry_alloc failed", 0, 0, 0 );
ldif_close( fp );
return LDAP_OTHER;
}
usr_attr->e_attrs = NULL;
- while( ldif_read_record( fp, &lineno, &buf, &lmax ) ) {
+ while(( ldifrc = ldif_read_record( fp, &lineno, &buf, &lmax )) > 0 ) {
Entry *e = str2entry( buf );
Attribute *a;
if( e == NULL ) {
- fprintf( stderr, "root_dse: could not parse entry (line=%d)\n",
- lineno );
- rc = EXIT_FAILURE;
+ Debug( LDAP_DEBUG_ANY, "root_dse_read_file: "
+ "could not parse entry (file=\"%s\" line=%lu)\n",
+ fname, lineno, 0 );
+ rc = LDAP_OTHER;
break;
}
/* make sure the DN is the empty DN */
if( e->e_nname.bv_len ) {
- fprintf( stderr,
- "root_dse: invalid rootDSE - dn=\"%s\" (line=%d)\n",
- e->e_dn, lineno );
+ Debug( LDAP_DEBUG_ANY,
+ "root_dse_read_file: invalid rootDSE "
+ "- dn=\"%s\" (file=\"%s\" line=%lu)\n",
+ e->e_dn, fname, lineno );
entry_free( e );
- rc = EXIT_FAILURE;
+ rc = LDAP_OTHER;
break;
}
if (rc) break;
}
+ if ( ldifrc < 0 )
+ rc = LDAP_OTHER;
+
if (rc) {
entry_free( usr_attr );
usr_attr = NULL;
ldif_close( fp );
- Debug(LDAP_DEBUG_CONFIG, "rootDSE file %s read.\n", fname, 0, 0);
+ Debug(LDAP_DEBUG_CONFIG, "rootDSE file=\"%s\" read.\n", fname, 0, 0);
return rc;
}
int
slap_discover_feature(
- const char *uri,
- int version,
+ slap_bindconf *sb,
const char *attr,
const char *val )
{
- LDAP *ld;
+ LDAP *ld = NULL;
LDAPMessage *res = NULL, *entry;
int rc, i;
- struct berval cred = BER_BVC( "" ),
- bv_val,
+ struct berval 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 );
+ rc = slap_client_connect( &ld, sb );
if ( rc != LDAP_SUCCESS ) {
goto done;
}
+ attrs[ 0 ] = (char *) attr;
rc = ldap_search_ext_s( ld, "", LDAP_SCOPE_BASE, "(objectClass=*)",
attrs, 0, NULL, NULL, NULL, 0, &res );
if ( rc != LDAP_SUCCESS ) {
goto done;
}
+ ber_str2bv( val, 0, 0, &bv_val );
for ( i = 0; values[ i ] != NULL; i++ ) {
if ( bvmatch( &bv_val, values[ i ] ) ) {
rc = LDAP_COMPARE_TRUE;
projects / openldap / blobdiff