X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackend.c;h=530410362cc165631370bde305185b41f1baa2bd;hb=f89308915aabff352eb390a1e58a71127b7ebd26;hp=02bfac50ccf6fa7570367eca8a995125adf769e5;hpb=295f3ba0aa4cdce147612da6400f93e8f4b0a79f;p=openldap diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index 02bfac50cc..530410362c 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -1,6 +1,6 @@ /* $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 */ @@ -18,38 +18,55 @@ #include "slap.h" #include "lutil.h" -#ifdef SLAPD_DNSSRV +/* + * If a module is configured as dynamic, its header should not + * get included into slapd. While this is a general rule and does + * not have much of an effect in UNIX, this rule should be adhered + * to for Windows, where dynamic object code should not be implicitly + * imported into slapd without appropriate __declspec(dllimport) directives. + */ + +#if defined(SLAPD_BDB) && !defined(SLAPD_BDB_DYNAMIC) +#include "back-bdb/external.h" +#endif +#if defined(SLAPD_DNSSRV) && !defined(SLAPD_DNSSRV_DYNAMIC) #include "back-dnssrv/external.h" #endif -#ifdef SLAPD_LDAP +#if defined(SLAPD_LDAP) && !defined(SLAPD_LDAP_DYNAMIC) #include "back-ldap/external.h" #endif -#ifdef SLAPD_LDBM +#if defined(SLAPD_LDBM) && !defined(SLAPD_LDBM_DYNAMIC) #include "back-ldbm/external.h" #endif -#ifdef SLAPD_BDB2 -#include "back-bdb2/external.h" +#if defined(SLAPD_META) && !defined(SLAPD_META_DYNAMIC) +#include "back-meta/external.h" +#endif +#if defined(SLAPD_MONITOR) && !defined(SLAPD_MONITOR_DYNAMIC) +#include "back-monitor/external.h" #endif -#ifdef SLAPD_PASSWD +#if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC) #include "back-passwd/external.h" #endif -#ifdef SLAPD_PERL +#if defined(SLAPD_PERL) && !defined(SLAPD_PERL_DYNAMIC) #include "back-perl/external.h" #endif -#ifdef SLAPD_SHELL +#if defined(SLAPD_SHELL) && !defined(SLAPD_SHELL_DYNAMIC) #include "back-shell/external.h" #endif -#ifdef SLAPD_TCL +#if defined(SLAPD_TCL) && !defined(SLAPD_TCL_DYNAMIC) #include "back-tcl/external.h" #endif -#ifdef SLAPD_NTDOMAIN -#include "back-domain/external.h" -#endif -#ifdef SLAPD_SQL +#if defined(SLAPD_SQL) && !defined(SLAPD_SQL_DYNAMIC) #include "back-sql/external.h" #endif +#if defined(SLAPD_PRIVATE) && !defined(SLAPD_PRIVATE_DYNAMIC) +#include "private/external.h" +#endif static BackendInfo binfo[] = { +#if defined(SLAPD_BDB) && !defined(SLAPD_BDB_DYNAMIC) + {"bdb", bdb_initialize}, +#endif #if defined(SLAPD_DNSSRV) && !defined(SLAPD_DNSSRV_DYNAMIC) {"dnssrv", dnssrv_back_initialize}, #endif @@ -59,8 +76,11 @@ static BackendInfo binfo[] = { #if defined(SLAPD_LDBM) && !defined(SLAPD_LDBM_DYNAMIC) {"ldbm", ldbm_back_initialize}, #endif -#if defined(SLAPD_BDB2) && !defined(SLAPD_BDB2_DYNAMIC) - {"bdb2", bdb2_back_initialize}, +#if defined(SLAPD_META) && !defined(SLAPD_META_DYNAMIC) + {"meta", meta_back_initialize}, +#endif +#if defined(SLAPD_MONITOR) && !defined(SLAPD_MONITOR_DYNAMIC) + {"monitor", monitor_back_initialize}, #endif #if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC) {"passwd", passwd_back_initialize}, @@ -74,11 +94,12 @@ static BackendInfo binfo[] = { #if defined(SLAPD_TCL) && !defined(SLAPD_TCL_DYNAMIC) {"tcl", tcl_back_initialize}, #endif -#if defined(SLAPD_NTDOMAIN) && !defined(SLAPD_NTDOMAIN_DYNAMIC) - {"ntdom", domain_back_initialize}, -#endif #if defined(SLAPD_SQL) && !defined(SLAPD_SQL_DYNAMIC) {"sql", sql_back_initialize}, +#endif + /* for any private backend */ +#if defined(SLAPD_PRIVATE) && !defined(SLAPD_PRIVATE_DYNAMIC) + {"private", private_back_initialize}, #endif {NULL} }; @@ -95,8 +116,13 @@ int backend_init(void) if((nBackendInfo != 0) || (backendInfo != NULL)) { /* already initialized */ +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_ERR, + "backend_init: backend already initialized\n" )); +#else Debug( LDAP_DEBUG_ANY, "backend_init: already initialized.\n", 0, 0, 0 ); +#endif return -1; } @@ -107,10 +133,15 @@ int backend_init(void) rc = binfo[nBackendInfo].bi_init( &binfo[nBackendInfo] ); if(rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_INFO, + "backend_init: initialized for type \"%s\"\n", + binfo[nBackendInfo].bi_type )); +#else Debug( LDAP_DEBUG_ANY, "backend_init: initialized for type \"%s\"\n", - binfo[nBackendInfo].bi_type, 0, 0 ); - + binfo[nBackendInfo].bi_type, 0, 0 ); +#endif /* destroy those we've already inited */ for( nBackendInfo--; nBackendInfo >= 0 ; @@ -133,9 +164,15 @@ int backend_init(void) #ifdef SLAPD_MODULES return 0; #else + +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_ERR, + "backend_init: failed\n" )); +#else Debug( LDAP_DEBUG_ANY, "backend_init: failed\n", 0, 0, 0 ); +#endif return rc; #endif /* SLAPD_MODULES */ @@ -146,9 +183,15 @@ int backend_add(BackendInfo *aBackendInfo) int rc = 0; if ((rc = aBackendInfo->bi_init(aBackendInfo)) != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_ERR, + "backend_add: initialization for type \"%s\" failed\n", + aBackendInfo->bi_type )); +#else Debug( LDAP_DEBUG_ANY, "backend_add: initialization for type \"%s\" failed\n", aBackendInfo->bi_type, 0, 0 ); +#endif return rc; } @@ -159,13 +202,13 @@ int backend_add(BackendInfo *aBackendInfo) /* if backendInfo == binfo no deallocation of old backendInfo */ if (backendInfo == binfo) { newBackendInfo = ch_calloc(nBackendInfo + 1, sizeof(BackendInfo)); - memcpy(newBackendInfo, backendInfo, sizeof(BackendInfo) * + AC_MEMCPY(newBackendInfo, backendInfo, sizeof(BackendInfo) * nBackendInfo); } else { newBackendInfo = ch_realloc(backendInfo, sizeof(BackendInfo) * (nBackendInfo + 1)); } - memcpy(&newBackendInfo[nBackendInfo], aBackendInfo, + AC_MEMCPY(&newBackendInfo[nBackendInfo], aBackendInfo, sizeof(BackendInfo)); backendInfo = newBackendInfo; nBackendInfo++; @@ -181,26 +224,44 @@ int backend_startup(Backend *be) if( ! ( nBackendDB > 0 ) ) { /* no databases */ +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_INFO, + "backend_startup: %d databases to startup. \n", + nBackendDB )); +#else Debug( LDAP_DEBUG_ANY, "backend_startup: %d databases to startup.\n", nBackendDB, 0, 0 ); +#endif return 1; } if(be != NULL) { /* startup a specific backend database */ +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, + "backend_startup: starting \"%s\"\n", + be->be_suffix[0]->bv_val )); +#else Debug( LDAP_DEBUG_TRACE, - "backend_startup: starting database\n", - 0, 0, 0 ); + "backend_startup: starting \"%s\"\n", + be->be_suffix[0]->bv_val, 0, 0 ); +#endif if ( be->bd_info->bi_open ) { rc = be->bd_info->bi_open( be->bd_info ); } if(rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_CRIT, + "backend_startup: bi_open failed!\n" )); +#else Debug( LDAP_DEBUG_ANY, "backend_startup: bi_open failed!\n", 0, 0, 0 ); +#endif + return rc; } @@ -209,9 +270,14 @@ int backend_startup(Backend *be) } if(rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_CRIT, + "backend_startup: bi_db_open failed!\n" )); +#else Debug( LDAP_DEBUG_ANY, "backend_startup: bi_db_open failed!\n", 0, 0, 0 ); +#endif return rc; } @@ -231,9 +297,14 @@ int backend_startup(Backend *be) } if(rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_CRIT, + "backend_startup: bi_open %d failed!\n", i )); +#else Debug( LDAP_DEBUG_ANY, "backend_startup: bi_open %d failed!\n", i, 0, 0 ); +#endif return rc; } } @@ -249,9 +320,14 @@ int backend_startup(Backend *be) } if(rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_CRIT, + "backend_startup: bi_db_open %d failed!\n", i )); +#else Debug( LDAP_DEBUG_ANY, "backend_startup: bi_db_open %d failed!\n", i, 0, 0 ); +#endif return rc; } } @@ -303,9 +379,15 @@ int backend_shutdown( Backend *be ) } if(rc != 0) { +#ifdef NEW_LOGGING + LDAP_LOG(( "backend", LDAP_LEVEL_NOTICE, + "backend_shutdown: bi_close %s failed!\n", + backendDB[i].be_type )); +#else Debug( LDAP_DEBUG_ANY, "backend_close: bi_close %s failed!\n", backendDB[i].be_type, 0, 0 ); +#endif } } @@ -328,14 +410,21 @@ int backend_shutdown( Backend *be ) 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( 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 ); /* destroy each backend type */ for( i = 0; i < nBackendInfo; i++ ) { @@ -395,16 +484,15 @@ backend_db_init( be = &backends[nbackends++]; be->bd_info = bi; - be->be_sizelimit = defsize; - be->be_timelimit = deftime; + be->be_def_limit = deflimit; be->be_dfltaccess = global_default_access; + be->be_restrictops = global_restrictops; + be->be_requires = global_requires; + /* assign a default depth limit for alias deref */ be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH; - be->be_realm = global_realm != NULL - ? ch_strdup( global_realm ) : NULL; - if(bi->bi_db_init) { rc = bi->bi_db_init( be ); } @@ -432,29 +520,58 @@ be_db_close( void ) } Backend * -select_backend( const char * dn ) +select_backend( + struct berval * dn, + int manageDSAit, + int noSubs ) { - int i, j, len, dnlen; + int i, j; + ber_len_t len, dnlen = dn->bv_len; + Backend *be = NULL; - dnlen = strlen( dn ); for ( i = 0; i < nbackends; i++ ) { for ( j = 0; backends[i].be_nsuffix != NULL && backends[i].be_nsuffix[j] != NULL; j++ ) { - len = strlen( backends[i].be_nsuffix[j] ); + if (( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) + && noSubs ) + { + continue; + } + + len = backends[i].be_nsuffix[j]->bv_len; if ( len > dnlen ) { + /* suffix is longer than DN */ + continue; + } + + if ( len && len < dnlen && + ( !DN_SEPARATOR( dn->bv_val[(dnlen-len)-1] ) || + DN_ESCAPE( dn->bv_val[(dnlen-len)-2] ) ) ) + { + /* make sure we have a separator */ continue; } - if ( strcmp( backends[i].be_nsuffix[j], - dn + (dnlen - len) ) == 0 ) { - return( &backends[i] ); + if ( strcmp( backends[i].be_nsuffix[j]->bv_val, + &dn->bv_val[dnlen-len] ) == 0 ) + { + if( be == NULL ) { + be = &backends[i]; + + if( manageDSAit && len == dnlen ) { + continue; + } + } else { + be = &backends[i]; + } + return be; } } } - return( NULL ); + return be; } int @@ -464,9 +581,13 @@ be_issuffix( ) { int i; + size_t len = strlen(suffix); for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i] != NULL; i++ ) { - if ( strcmp( be->be_nsuffix[i], suffix ) == 0 ) { + if ( len != be->be_nsuffix[i]->bv_len ) { + continue; + } + if ( strcmp( be->be_nsuffix[i]->bv_val, suffix ) == 0 ) { return( 1 ); } } @@ -475,35 +596,44 @@ be_issuffix( } int -be_isroot( Backend *be, const char *ndn ) +be_isroot( Backend *be, struct berval *ndn ) { - int rc; + if ( !ndn->bv_len ) { + return( 0 ); + } - if ( ndn == NULL || *ndn == '\0' ) { + if ( !be->be_rootndn.bv_len ) { return( 0 ); } - if ( be->be_root_ndn == NULL || *be->be_root_ndn == '\0' ) { + return dn_match( &be->be_rootndn, ndn ); +} + +int +be_isupdate( Backend *be, struct berval *ndn ) +{ + if ( !ndn->bv_len ) { return( 0 ); } - rc = strcmp( be->be_root_ndn, ndn ) ? 0 : 1; + if ( !be->be_update_ndn.bv_len ) { + return( 0 ); + } - return(rc); + return dn_match( &be->be_update_ndn, ndn ); } -char * +struct berval * be_root_dn( Backend *be ) { - if ( be->be_root_dn == NULL ) { - return( "" ); - } - - return be->be_root_dn; + return &be->be_rootdn; } int -be_isroot_pw( Backend *be, const char *ndn, struct berval *cred ) +be_isroot_pw( Backend *be, + Connection *conn, + struct berval *ndn, + struct berval *cred ) { int result; @@ -511,29 +641,40 @@ be_isroot_pw( Backend *be, const char *ndn, struct berval *cred ) return 0; } - if( be->be_root_pw.bv_len == 0 ) { + if( be->be_rootpw.bv_len == 0 ) { return 0; } -#ifdef SLAPD_CRYPT - ldap_pvt_thread_mutex_lock( &crypt_mutex ); +#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) + ldap_pvt_thread_mutex_lock( &passwd_mutex ); +#ifdef SLAPD_SPASSWD + lutil_passwd_sasl_conn = conn->c_sasl_context; +#endif #endif - result = lutil_passwd( &be->be_root_pw, cred, NULL ); + result = lutil_passwd( &be->be_rootpw, cred, NULL ); -#ifdef SLAPD_CRYPT - ldap_pvt_thread_mutex_unlock( &crypt_mutex ); +#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) +#ifdef SLAPD_SPASSWD + lutil_passwd_sasl_conn = NULL; +#endif + ldap_pvt_thread_mutex_unlock( &passwd_mutex ); #endif return result == 0; } int -be_entry_release_rw( Backend *be, Entry *e, int rw ) +be_entry_release_rw( + BackendDB *be, + Connection *conn, + Operation *op, + Entry *e, + int rw ) { if ( be->be_release ) { /* free and release entry from backend */ - return be->be_release( be, e, rw ); + return be->be_release( be, conn, op, e, rw ); } else { /* free entry */ entry_free( e ); @@ -590,7 +731,7 @@ backend_connection_destroy( return 0; } -int +static int backend_check_controls( Backend *be, Connection *conn, @@ -615,12 +756,206 @@ backend_check_controls( return LDAP_SUCCESS; } +int +backend_check_restrictions( + Backend *be, + Connection *conn, + Operation *op, + const void *opdata, + const char **text ) +{ + int rc; + slap_mask_t restrictops; + slap_mask_t requires; + slap_mask_t opflag; + slap_ssf_set_t *ssf; + int updateop = 0; + + if( be ) { + rc = backend_check_controls( be, conn, op, text ); + + if( rc != LDAP_SUCCESS ) { + return rc; + } + + restrictops = be->be_restrictops; + requires = be->be_requires; + ssf = &be->be_ssf_set; + + } else { + restrictops = global_restrictops; + requires = global_requires; + ssf = &global_ssf_set; + } + + switch( op->o_tag ) { + case LDAP_REQ_ADD: + opflag = SLAP_RESTRICT_OP_ADD; + updateop++; + break; + case LDAP_REQ_BIND: + opflag = SLAP_RESTRICT_OP_BIND; + break; + case LDAP_REQ_COMPARE: + opflag = SLAP_RESTRICT_OP_COMPARE; + break; + case LDAP_REQ_DELETE: + updateop++; + opflag = SLAP_RESTRICT_OP_DELETE; + break; + case LDAP_REQ_EXTENDED: + opflag = SLAP_RESTRICT_OP_EXTENDED; + break; + case LDAP_REQ_MODIFY: + updateop++; + opflag = SLAP_RESTRICT_OP_MODIFY; + break; + case LDAP_REQ_RENAME: + updateop++; + opflag = SLAP_RESTRICT_OP_RENAME; + break; + case LDAP_REQ_SEARCH: + opflag = SLAP_RESTRICT_OP_SEARCH; + break; + case LDAP_REQ_UNBIND: + opflag = 0; + break; + default: + *text = "restrict operations internal error"; + return LDAP_OTHER; + } + + if ( op->o_tag != LDAP_REQ_EXTENDED + || strcmp( (const char *) opdata, LDAP_EXOP_START_TLS ) ) + { + /* these checks don't apply to StartTLS */ + + if( op->o_tag == LDAP_REQ_EXTENDED ) { + /* threat other extended operations as update ops */ + updateop++; + } + + if( op->o_transport_ssf < ssf->sss_transport ) { + *text = "transport confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + + if( op->o_tls_ssf < ssf->sss_tls ) { + *text = "TLS confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + + if( op->o_tag != LDAP_REQ_BIND || opdata == NULL ) { + /* these checks don't apply to SASL bind */ + + if( op->o_sasl_ssf < ssf->sss_sasl ) { + *text = "SASL confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + + if( op->o_ssf < ssf->sss_ssf ) { + *text = "confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + } + + if( updateop ) { + if( op->o_transport_ssf < ssf->sss_update_transport ) { + *text = "transport update confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + + if( op->o_tls_ssf < ssf->sss_update_tls ) { + *text = "TLS update confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + + if( op->o_sasl_ssf < ssf->sss_update_sasl ) { + *text = "SASL update confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + + if( op->o_ssf < ssf->sss_update_ssf ) { + *text = "update confidentiality required"; + return LDAP_CONFIDENTIALITY_REQUIRED; + } + + if( op->o_ndn.bv_len == 0 ) { + *text = "modifications require authentication"; + return LDAP_OPERATIONS_ERROR; + } + } + } + + if ( op->o_tag != LDAP_REQ_BIND && ( op->o_tag != LDAP_REQ_EXTENDED || + strcmp( (const char *) opdata, LDAP_EXOP_START_TLS ) ) ) + { + /* these checks don't apply to Bind or StartTLS */ + + if( requires & SLAP_REQUIRE_STRONG ) { + /* should check mechanism */ + if( op->o_authmech == NULL || op->o_dn.bv_len == 0 ) + { + *text = "strong authentication required"; + return LDAP_STRONG_AUTH_REQUIRED; + } + } + + if( requires & SLAP_REQUIRE_SASL ) { + if( op->o_authmech == NULL || op->o_dn.bv_len == 0 ) + { + *text = "SASL authentication required"; + return LDAP_STRONG_AUTH_REQUIRED; + } + } + + if( requires & SLAP_REQUIRE_AUTHC ) { + if( op->o_dn.bv_len == 0 ) { + *text = "authentication required"; + return LDAP_UNWILLING_TO_PERFORM; + } + } + + if( requires & SLAP_REQUIRE_BIND ) { + int version; + ldap_pvt_thread_mutex_lock( &conn->c_mutex ); + version = conn->c_protocol; + ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); + + if( !version ) { + /* no bind has occurred */ + *text = "BIND required"; + return LDAP_OPERATIONS_ERROR; + } + } + + if( requires & SLAP_REQUIRE_LDAP_V3 ) { + if( op->o_protocol < LDAP_VERSION3 ) { + /* no bind has occurred */ + *text = "operation restricted to LDAPv3 clients"; + return LDAP_OPERATIONS_ERROR; + } + } + } + + if( restrictops & opflag ) { + if( restrictops == SLAP_RESTRICT_OP_READS ) { + *text = "read operations restricted"; + } else { + *text = "operation restricted"; + } + return LDAP_UNWILLING_TO_PERFORM; + } + + return LDAP_SUCCESS; +} + int backend_check_referrals( Backend *be, Connection *conn, Operation *op, - const char *dn, - const char *ndn ) + struct berval *dn, + struct berval *ndn ) { int rc = LDAP_SUCCESS; @@ -642,26 +977,66 @@ int backend_check_referrals( int backend_group( Backend *be, + Connection *conn, + Operation *op, Entry *target, - const char *gr_ndn, - const char *op_ndn, + struct berval *gr_ndn, + struct berval *op_ndn, ObjectClass *group_oc, AttributeDescription *group_at ) { - if( strcmp( target->e_ndn, gr_ndn ) != 0 ) { + GroupAssertion *g; + int i; + + ldap_pvt_thread_mutex_lock( &op->o_abandonmutex ); + i = op->o_abandon; + ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex ); + if (i) return SLAPD_ABANDON; + + if ( !dn_match( &target->e_nname, gr_ndn ) ) { /* we won't attempt to send it to a different backend */ - be = select_backend(gr_ndn); + be = select_backend( gr_ndn, 0, + (be->be_flags & SLAP_BFLAG_GLUE_INSTANCE)); if (be == NULL) { return LDAP_NO_SUCH_OBJECT; } } + ldap_pvt_thread_mutex_lock( &conn->c_mutex ); + for (g = conn->c_groups; g; g=g->next) { + if (g->be != be || g->oc != group_oc || g->at != group_at || + g->len != gr_ndn->bv_len) + continue; + if (strcmp( g->ndn, gr_ndn->bv_val ) == 0) + break; + } + ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); + if (g) + return g->res; + if( be->be_group ) { - return be->be_group( be, target, gr_ndn, op_ndn, + int res = be->be_group( be, conn, op, + target, gr_ndn, op_ndn, group_oc, group_at ); + + if (op->o_tag != LDAP_REQ_BIND) { + g = ch_malloc(sizeof(GroupAssertion) + gr_ndn->bv_len); + g->be = be; + g->oc = group_oc; + g->at = group_at; + g->res = res; + g->len = gr_ndn->bv_len; + strcpy(g->ndn, gr_ndn->bv_val); + ldap_pvt_thread_mutex_lock( &conn->c_mutex ); + g->next = conn->c_groups; + conn->c_groups = g; + ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); + } + + return res; } return LDAP_UNWILLING_TO_PERFORM; @@ -673,15 +1048,16 @@ backend_attribute( Connection *conn, Operation *op, Entry *target, - const char *e_ndn, + struct berval *edn, AttributeDescription *entry_at, - const char ***vals + BerVarray *vals ) { - if( target == NULL || strcmp( target->e_ndn, e_ndn ) != 0 ) { + if ( target == NULL || !dn_match( &target->e_nname, edn ) ) { /* we won't attempt to send it to a different backend */ - be = select_backend(e_ndn); + be = select_backend( edn, 0, + (be->be_flags & SLAP_BFLAG_GLUE_INSTANCE)); if (be == NULL) { return LDAP_NO_SUCH_OBJECT; @@ -689,7 +1065,7 @@ backend_attribute( } if( be->be_attribute ) { - return be->be_attribute( be, conn, op, target, e_ndn, + return be->be_attribute( be, conn, op, target, edn, entry_at, vals ); } @@ -698,21 +1074,28 @@ backend_attribute( Attribute *backend_operational( Backend *be, - Entry *e ) + Connection *conn, + Operation *op, + Entry *e, + AttributeName *attrs, + int opattrs ) { - Attribute *a = NULL; + Attribute *a = NULL, **ap = &a; #ifdef SLAPD_SCHEMA_DN - a = ch_malloc( sizeof( Attribute ) ); - a->a_desc = ad_dup( slap_schema.si_ad_subschemaSubentry ); - - /* Should be backend specific */ - a->a_vals = ch_malloc( 2 * sizeof( struct berval * ) ); - a->a_vals[0] = ber_bvstrdup( SLAPD_SCHEMA_DN ); - a->a_vals[1] = NULL; - - a->a_next = NULL; + *ap = slap_operational_subschemaSubentry(); + ap = &(*ap)->a_next; #endif + /* + * If operational attributes (allegedly) are required, + * and the backend supports specific operational attributes, + * add them to the attribute list + */ + if ( ( opattrs || attrs ) && be && be->be_operational != NULL ) { + ( void )be->be_operational( be, conn, op, e, attrs, opattrs, ap ); + } + return a; } +