/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* backend.c - routines for dealing with back-end databases */
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
- "backend_startup: bi_db_open failed!\n" ));
+ "backend_startup: bi_db_open failed! (%d)\n", rc ));
#else
Debug( LDAP_DEBUG_ANY,
- "backend_startup: bi_db_open failed!\n",
- 0, 0, 0 );
+ "backend_startup: bi_db_open failed! (%d)\n",
+ rc, 0, 0 );
#endif
return rc;
}
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
- "backend_startup: bi_db_open %d failed!\n", i ));
+ "backend_startup: bi_db_open(%d) failed! (%d)\n",
+ i, rc ));
#else
Debug( LDAP_DEBUG_ANY,
- "backend_startup: bi_db_open %d failed!\n",
- i, 0, 0 );
+ "backend_startup: bi_db_open(%d) failed! (%d)\n",
+ i, rc, 0 );
#endif
return rc;
}
int backend_destroy(void)
{
int i;
+ BackendDB *bd;
/* destroy each backend database */
- for( i = 0; i < nBackendDB; i++ ) {
- if ( backendDB[i].bd_info->bi_db_destroy ) {
- backendDB[i].bd_info->bi_db_destroy(
- &backendDB[i] );
+ for( i = 0, bd = backendDB; i < nBackendDB; i++, bd++ ) {
+ if ( bd->bd_info->bi_db_destroy ) {
+ bd->bd_info->bi_db_destroy( bd );
}
- ber_bvecfree( backendDB[i].be_suffix );
- ber_bvecfree( backendDB[i].be_nsuffix );
- free( backendDB[i].be_rootdn.bv_val );
- free( backendDB[i].be_rootndn.bv_val );
- free( backendDB[i].be_rootpw.bv_val );
- acl_destroy( backendDB[i].be_acl, global_acl );
+ ber_bvecfree( bd->be_suffix );
+ ber_bvecfree( bd->be_nsuffix );
+ if ( bd->be_rootdn.bv_val ) free( bd->be_rootdn.bv_val );
+ if ( bd->be_rootndn.bv_val ) free( bd->be_rootndn.bv_val );
+ if ( bd->be_rootpw.bv_val ) free( bd->be_rootpw.bv_val );
+ acl_destroy( bd->be_acl, global_acl );
}
free( backendDB );
be->be_restrictops = global_restrictops;
be->be_requires = global_requires;
+ be->be_ssf_set = global_ssf_set;
/* assign a default depth limit for alias deref */
be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH;
for ( j = 0; backends[i].be_nsuffix != NULL &&
backends[i].be_nsuffix[j] != NULL; j++ )
{
- if ((backends[i].be_glueflags&SLAP_GLUE_SUBORDINATE)&&
- noSubs)
+ if (( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE )
+ && noSubs )
+ {
continue;
+ }
len = backends[i].be_nsuffix[j]->bv_len;
int
be_issuffix(
Backend *be,
- const char *suffix
+ struct berval *bvsuffix
)
{
int i;
- size_t len = strlen(suffix);
for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i] != NULL; i++ ) {
- if ( len != be->be_nsuffix[i]->bv_len ) {
- continue;
- }
- if ( strcmp( be->be_nsuffix[i]->bv_val, suffix ) == 0 ) {
+ if ( ber_bvcmp( be->be_nsuffix[i], bvsuffix ) == 0 ) {
return( 1 );
}
}
return( 0 );
}
- return strcmp( be->be_rootndn.bv_val, ndn->bv_val ) ? 0 : 1;
+ return dn_match( &be->be_rootndn, ndn );
}
int
return( 0 );
}
- return strcmp( be->be_update_ndn.bv_val, ndn->bv_val ) ? 0 : 1;
+ return dn_match( &be->be_update_ndn, ndn );
}
-char *
+struct berval *
be_root_dn( Backend *be )
{
- if ( !be->be_rootdn.bv_len ) {
- return( "" );
- }
-
- return be->be_rootdn.bv_val;
+ return &be->be_rootdn;
}
int
be_isroot_pw( Backend *be,
Connection *conn,
- const char *dn,
+ struct berval *ndn,
struct berval *cred )
{
int result;
- struct berval ndn;
- ndn.bv_val = (char *) dn;
- ndn.bv_len = dn ? strlen( dn ) : 0;
-
- if ( ! be_isroot( be, &ndn ) ) {
+ if ( ! be_isroot( be, ndn ) ) {
return 0;
}
if( (*ctrls)->ldctl_iscritical &&
!charray_inlist( be->be_controls, (*ctrls)->ldctl_oid ) )
{
- *text = "control unavailable in NamingContext";
+ *text = "control unavailable in context";
return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
}
}
const char *text;
rc = be->be_chk_referrals( be,
- conn, op, dn->bv_val, ndn->bv_val, &text );
+ conn, op, dn, ndn, &text );
if( rc != LDAP_SUCCESS && rc != LDAP_REFERRAL ) {
send_ldap_result( conn, op, rc,
ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
if (i) return SLAPD_ABANDON;
- if( target->e_nname.bv_len != gr_ndn->bv_len ||
- strcmp( target->e_nname.bv_val, gr_ndn->bv_val ) != 0 ) {
+ if ( !dn_match( &target->e_nname, gr_ndn ) ) {
/* we won't attempt to send it to a different backend */
be = select_backend( gr_ndn, 0,
- (be->be_glueflags & SLAP_GLUE_INSTANCE));
+ (be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
if (be == NULL) {
return LDAP_NO_SUCH_OBJECT;
if( be->be_group ) {
int res = be->be_group( be, conn, op,
- target, gr_ndn->bv_val, op_ndn->bv_val,
+ target, gr_ndn, op_ndn,
group_oc, group_at );
if (op->o_tag != LDAP_REQ_BIND) {
Entry *target,
struct berval *edn,
AttributeDescription *entry_at,
- struct berval ***vals
+ BerVarray *vals
)
{
- if( target == NULL || target->e_nname.bv_len != edn->bv_len ||
- strcmp( target->e_ndn, edn->bv_val ) != 0 )
- {
+ if ( target == NULL || !dn_match( &target->e_nname, edn ) ) {
/* we won't attempt to send it to a different backend */
be = select_backend( edn, 0,
- (be->be_glueflags & SLAP_GLUE_INSTANCE));
+ (be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
if (be == NULL) {
return LDAP_NO_SUCH_OBJECT;
}
if( be->be_attribute ) {
- return be->be_attribute( be, conn, op, target, edn->bv_val,
+ return be->be_attribute( be, conn, op, target, edn,
entry_at, vals );
}
Connection *conn,
Operation *op,
Entry *e,
- char **attrs,
+ AttributeName *attrs,
int opattrs )
{
Attribute *a = NULL, **ap = &a;
projects / openldap / blobdiff