/* $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 */
#include "portable.h"
+#include "slapi_common.h"
#include <stdio.h>
#include <sys/stat.h>
#include "slap.h"
+#include "slapi.h"
#include "lutil.h"
+#include "lber_pvt.h"
/*
* If a module is configured as dynamic, its header should not
#if defined(SLAPD_MONITOR) && !defined(SLAPD_MONITOR_DYNAMIC)
#include "back-monitor/external.h"
#endif
+#if defined(SLAPD_NULL) && !defined(SLAPD_NULL_DYNAMIC)
+#include "back-null/external.h"
+#endif
#if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC)
#include "back-passwd/external.h"
#endif
#if defined(SLAPD_MONITOR) && !defined(SLAPD_MONITOR_DYNAMIC)
{"monitor", monitor_back_initialize},
#endif
+#if defined(SLAPD_NULL) && !defined(SLAPD_NULL_DYNAMIC)
+ {"null", null_back_initialize},
+#endif
#if defined(SLAPD_PASSWD) && !defined(SLAPD_PASSWD_DYNAMIC)
{"passwd", passwd_back_initialize},
#endif
if((nBackendInfo != 0) || (backendInfo != NULL)) {
/* already initialized */
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "backend_init: backend already initialized\n" ));
+ LDAP_LOG( BACKEND, ERR,
+ "backend_init: backend already initialized\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"backend_init: already initialized.\n", 0, 0, 0 );
if(rc != 0) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+ LDAP_LOG( BACKEND, INFO,
"backend_init: initialized for type \"%s\"\n",
- binfo[nBackendInfo].bi_type ));
+ binfo[nBackendInfo].bi_type, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"backend_init: initialized for type \"%s\"\n",
#else
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "backend_init: failed\n" ));
+ LDAP_LOG( BACKEND, ERR, "backend_init: failed\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"backend_init: failed\n",
if ((rc = aBackendInfo->bi_init(aBackendInfo)) != 0) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ LDAP_LOG( BACKEND, ERR,
"backend_add: initialization for type \"%s\" failed\n",
- aBackendInfo->bi_type ));
+ aBackendInfo->bi_type, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"backend_add: initialization for type \"%s\" failed\n",
if( ! ( nBackendDB > 0 ) ) {
/* no databases */
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "backend_startup: %d databases to startup. \n",
- nBackendDB ));
+ LDAP_LOG( BACKEND, INFO,
+ "backend_startup: %d databases to startup. \n", nBackendDB, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: %d databases to startup.\n",
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 ));
+ LDAP_LOG( BACKEND, DETAIL1, "backend_startup: starting \"%s\"\n",
+ be->be_suffix[0].bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"backend_startup: starting \"%s\"\n",
- be->be_suffix[0]->bv_val, 0, 0 );
+ 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) {
+ if ( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
- "backend_startup: bi_open failed!\n" ));
+ LDAP_LOG( BACKEND, CRIT, "backend_startup: bi_open failed!\n", 0, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY,
- "backend_startup: bi_open failed!\n",
- 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "backend_startup: bi_open failed!\n",
+ 0, 0, 0 );
#endif
- return rc;
+ return rc;
+ }
}
if ( be->bd_info->bi_db_open ) {
rc = be->bd_info->bi_db_open( be );
- }
-
- if(rc != 0) {
+ if ( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
- "backend_startup: bi_db_open failed!\n" ));
+ LDAP_LOG( BACKEND, CRIT,
+ "backend_startup: bi_db_open failed! (%d)\n", rc, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY,
- "backend_startup: bi_db_open failed!\n",
- 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "backend_startup: bi_db_open failed! (%d)\n",
+ rc, 0, 0 );
#endif
- return rc;
+ return rc;
+ }
}
return rc;
if( backendInfo[i].bi_open ) {
rc = backendInfo[i].bi_open(
&backendInfo[i] );
- }
-
- if(rc != 0) {
+ if ( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
- "backend_startup: bi_open %d failed!\n", i ));
+ LDAP_LOG( BACKEND, CRIT,
+ "backend_startup: bi_open %d failed!\n", i, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY,
- "backend_startup: bi_open %d failed!\n",
- i, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "backend_startup: bi_open %d failed!\n",
+ i, 0, 0 );
#endif
- return rc;
+ return rc;
+ }
}
}
if ( backendDB[i].bd_info->bi_db_open ) {
rc = backendDB[i].bd_info->bi_db_open(
&backendDB[i] );
- }
-
- if(rc != 0) {
+ if ( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
- "backend_startup: bi_db_open %d failed!\n", i ));
+ LDAP_LOG( BACKEND, CRIT,
+ "backend_startup: bi_db_open(%d) failed! (%d)\n", i, rc, 0 );
#else
- Debug( LDAP_DEBUG_ANY,
- "backend_startup: bi_db_open %d failed!\n",
- i, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "backend_startup: bi_db_open(%d) failed! (%d)\n",
+ i, rc, 0 );
#endif
- return rc;
+ return rc;
+ }
}
}
if(rc != 0) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_NOTICE,
- "backend_shutdown: bi_close %s failed!\n",
- backendDB[i].be_type ));
+ LDAP_LOG( BACKEND, NOTICE,
+ "backend_shutdown: bi_close %s failed!\n",
+ backendDB[i].be_type, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"backend_close: bi_close %s failed!\n",
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_bvarray_free( bd->be_suffix );
+ ber_bvarray_free( 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 ( i = 0; i < nbackends; i++ ) {
for ( j = 0; backends[i].be_nsuffix != NULL &&
- backends[i].be_nsuffix[j] != NULL; j++ )
+ backends[i].be_nsuffix[j].bv_val != 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;
+ len = backends[i].be_nsuffix[j].bv_len;
if ( len > dnlen ) {
/* suffix is longer than DN */
continue;
}
+ /*
+ * input DN is normalized, so the separator check
+ * need not look at escaping
+ */
if ( len && len < dnlen &&
- ( !DN_SEPARATOR( dn->bv_val[(dnlen-len)-1] ) ||
- DN_ESCAPE( dn->bv_val[(dnlen-len)-2] ) ) )
+ !DN_SEPARATOR( dn->bv_val[(dnlen-len)-1] ))
{
- /* make sure we have a separator */
continue;
}
- if ( strcmp( backends[i].be_nsuffix[j]->bv_val,
+ if ( strcmp( backends[i].be_nsuffix[j].bv_val,
&dn->bv_val[dnlen-len] ) == 0 )
{
if( be == NULL ) {
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 ) {
+ for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i].bv_val != NULL; i++ ) {
+ if ( bvmatch( &be->be_nsuffix[i], bvsuffix ) ) {
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 );
}
struct berval *
Operation *op
)
{
- int i;
+ int i;
+ int rc;
+ Slapi_PBlock *pb = op->o_pb;
+
+#if defined( LDAP_SLAPI )
+ slapi_pblock_set( pb, SLAPI_CONNECTION, (void *)conn );
+ slapi_pblock_set( pb, SLAPI_OPERATION, (void *)op );
+#endif /* defined( LDAP_SLAPI ) */
for ( i = 0; i < nbackends; i++ ) {
+#if defined( LDAP_SLAPI )
+ slapi_pblock_set( pb, SLAPI_BACKEND, (void *)&backends[i] );
+ rc = doPluginFNs( &backends[i], SLAPI_PLUGIN_PRE_UNBIND_FN,
+ (Slapi_PBlock *)pb );
+ if ( rc != 0 && rc != LDAP_OTHER ) {
+ /*
+ * either there is no preOp (unbind) plugins
+ * or a plugin failed. Just log it.
+ *
+ * FIXME: is this correct?
+ */
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_bind: Unbind preOps failed\n"));
+#else
+ Debug (LDAP_DEBUG_TRACE, " Unbind preOps failed.\n", 0, 0, 0);
+#endif
+ }
+#endif /* defined( LDAP_SLAPI ) */
+
if ( backends[i].be_unbind ) {
(*backends[i].be_unbind)( &backends[i], conn, op );
}
+
+#if defined( LDAP_SLAPI )
+ rc = doPluginFNs( &backends[i], SLAPI_PLUGIN_POST_UNBIND_FN,
+ (Slapi_PBlock *)pb );
+ if ( rc != 0 && rc != LDAP_OTHER ) {
+ /*
+ * either there is no postOp (unbind) plugins
+ * or a plugin failed. Just log it.
+ *
+ * FIXME: is this correct?
+ */
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_unbind: Unbind postOps failed\n"));
+#else
+ Debug (LDAP_DEBUG_TRACE, " Unbind postOps failed.\n", 0, 0, 0);
+#endif
+ }
+#endif /* defined( LDAP_SLAPI ) */
}
return 0;
Operation *op,
const char **text )
{
- LDAPControl **ctrls;
- ctrls = op->o_ctrls;
- if( ctrls == NULL ) {
- return LDAP_SUCCESS;
- }
+ LDAPControl **ctrls = op->o_ctrls;
+
+ if( ctrls == NULL ) return LDAP_SUCCESS;
for( ; *ctrls != NULL ; ctrls++ ) {
if( (*ctrls)->ldctl_iscritical &&
- !charray_inlist( be->be_controls, (*ctrls)->ldctl_oid ) )
+ !ldap_charray_inlist( be->be_controls, (*ctrls)->ldctl_oid ) )
{
- *text = "control unavailable in NamingContext";
+ *text = "control unavailable in context";
return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
}
}
Backend *be,
Connection *conn,
Operation *op,
- const void *opdata,
+ struct berval *opdata,
const char **text )
{
int rc;
slap_mask_t opflag;
slap_ssf_set_t *ssf;
int updateop = 0;
+ int starttls = 0;
+ int session = 0;
if( be ) {
rc = backend_check_controls( be, conn, op, text );
break;
case LDAP_REQ_BIND:
opflag = SLAP_RESTRICT_OP_BIND;
+ session++;
break;
case LDAP_REQ_COMPARE:
opflag = SLAP_RESTRICT_OP_COMPARE;
break;
case LDAP_REQ_EXTENDED:
opflag = SLAP_RESTRICT_OP_EXTENDED;
+
+ if( !opdata ) {
+ /* treat unspecified as a modify */
+ opflag = SLAP_RESTRICT_OP_MODIFY;
+ updateop++;
+ break;
+ }
+
+ {
+ struct berval bv = BER_BVC( LDAP_EXOP_START_TLS );
+ if( bvmatch( opdata, &bv ) ) {
+ session++;
+ starttls++;
+ break;
+ }
+ }
+
+ {
+ struct berval bv = BER_BVC( LDAP_EXOP_X_WHO_AM_I );
+ if( bvmatch( opdata, &bv ) ) {
+ break;
+ }
+ }
+
+ /* treat everything else as a modify */
+ opflag = SLAP_RESTRICT_OP_MODIFY;
+ updateop++;
break;
+
case LDAP_REQ_MODIFY:
updateop++;
opflag = SLAP_RESTRICT_OP_MODIFY;
opflag = SLAP_RESTRICT_OP_SEARCH;
break;
case LDAP_REQ_UNBIND:
+ session++;
opflag = 0;
break;
default:
return LDAP_OTHER;
}
- if ( op->o_tag != LDAP_REQ_EXTENDED
- || strcmp( (const char *) opdata, LDAP_EXOP_START_TLS ) )
- {
+ if ( !starttls ) {
/* 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;
return LDAP_CONFIDENTIALITY_REQUIRED;
}
+
+ if( op->o_tag == LDAP_REQ_BIND && opdata == NULL ) {
+ /* simple bind specific check */
+ if( op->o_ssf < ssf->sss_simple_bind ) {
+ *text = "confidentiality required";
+ return LDAP_CONFIDENTIALITY_REQUIRED;
+ }
+ }
+
if( op->o_tag != LDAP_REQ_BIND || opdata == NULL ) {
/* these checks don't apply to SASL bind */
return LDAP_CONFIDENTIALITY_REQUIRED;
}
- if( op->o_ndn.bv_len == 0 ) {
+ if( !( global_allows & SLAP_ALLOW_UPDATE_ANON ) &&
+ op->o_ndn.bv_len == 0 )
+ {
*text = "modifications require authentication";
- return LDAP_OPERATIONS_ERROR;
+ return LDAP_STRONG_AUTH_REQUIRED;
+ }
+
+#ifdef SLAP_X_LISTENER_MOD
+ if ( ! ( conn->c_listener->sl_perms & S_IWUSR ) ) {
+ /* no "w" mode means readonly */
+ *text = "modifications not allowed on this listener";
+ return LDAP_UNWILLING_TO_PERFORM;
}
+#endif /* SLAP_X_LISTENER_MOD */
}
}
- 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 ( !session ) {
+ /* these checks don't apply to Bind, StartTLS, or Unbind */
if( requires & SLAP_REQUIRE_STRONG ) {
/* should check mechanism */
- if( op->o_authmech == NULL || op->o_dn.bv_len == 0 )
+ if( ( op->o_transport_ssf < ssf->sss_transport
+ && op->o_authmech.bv_len == 0 ) || 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 )
- {
+ if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 ) {
*text = "SASL authentication required";
return LDAP_STRONG_AUTH_REQUIRED;
}
return LDAP_OPERATIONS_ERROR;
}
}
+
+#ifdef SLAP_X_LISTENER_MOD
+ if ( !starttls && op->o_dn.bv_len == 0 ) {
+ if ( ! ( conn->c_listener->sl_perms & S_IXUSR ) ) {
+ /* no "x" mode means bind required */
+ *text = "bind required on this listener";
+ return LDAP_STRONG_AUTH_REQUIRED;
+ }
+ }
+
+ if ( !starttls && !updateop ) {
+ if ( ! ( conn->c_listener->sl_perms & S_IRUSR ) ) {
+ /* no "r" mode means no read */
+ *text = "read not allowed on this listener";
+ return LDAP_UNWILLING_TO_PERFORM;
+ }
+ }
+#endif /* SLAP_X_LISTENER_MOD */
+
}
if( restrictops & opflag ) {
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,
)
{
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 ( op->o_abandon ) 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 = select_backend( gr_ndn, 0, 0 );
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)
+
+ for (g = conn->c_groups; g; g=g->ga_next) {
+ if (g->ga_be != be || g->ga_oc != group_oc ||
+ g->ga_at != group_at || g->ga_len != gr_ndn->bv_len)
continue;
- if (strcmp( g->ndn, gr_ndn->bv_val ) == 0)
+ if (strcmp( g->ga_ndn, gr_ndn->bv_val ) == 0)
break;
}
+
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
- if (g)
- return g->res;
+
+ if (g) {
+ return g->ga_res;
+ }
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) {
+ if ( op->o_tag != LDAP_REQ_BIND && !op->o_do_not_cache ) {
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);
+ g->ga_be = be;
+ g->ga_oc = group_oc;
+ g->ga_at = group_at;
+ g->ga_res = res;
+ g->ga_len = gr_ndn->bv_len;
+ strcpy(g->ga_ndn, gr_ndn->bv_val);
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- g->next = conn->c_groups;
+ g->ga_next = conn->c_groups;
conn->c_groups = g;
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
}
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 = select_backend( edn, 0, 0 );
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,
- struct berval **attrs,
+ AttributeName *attrs,
int opattrs )
{
Attribute *a = NULL, **ap = &a;
-#ifdef SLAPD_SCHEMA_DN
- *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 &&
+ ad_inlist( slap_schema.si_ad_subschemaSubentry, attrs )) ) {
+ *ap = slap_operational_subschemaSubentry( be );
+ ap = &(*ap)->a_next;
+ }
+
if ( ( opattrs || attrs ) && be && be->be_operational != NULL ) {
( void )be->be_operational( be, conn, op, e, attrs, opattrs, ap );
}
projects / openldap / blobdiff