#include "slap.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
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"backend_startup: starting \"%s\"\n",
- be->be_suffix[0]->bv_val ));
+ be->be_suffix[0].bv_val ));
#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 ) {
if ( bd->bd_info->bi_db_destroy ) {
bd->bd_info->bi_db_destroy( bd );
}
- ber_bvecfree( bd->be_suffix );
- ber_bvecfree( bd->be_nsuffix );
+ 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 );
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_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 ) {
} else {
be = &backends[i];
}
-
- assert( !be->be_ssf_set.sss_tls );
return be;
}
}
}
- assert( be == NULL || !be->be_ssf_set.sss_tls );
return be;
}
{
int i;
- for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i] != NULL; i++ ) {
- if ( ber_bvcmp( be->be_nsuffix[i], bvsuffix ) == 0 ) {
+ for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i].bv_val != NULL; i++ ) {
+ if ( ber_bvcmp( &be->be_nsuffix[i], bvsuffix ) == 0 ) {
return( 1 );
}
}
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( ber_bvcmp( opdata, &bv ) == 0 ) {
+ session++;
+ starttls++;
+ break;
+ }
+ }
+
+ {
+ struct berval bv = BER_BVC( LDAP_EXOP_X_WHO_AM_I );
+ if( ber_bvcmp( opdata, &bv ) == 0 ) {
+ 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;
}
if( op->o_tls_ssf < ssf->sss_tls ) {
- assert(0);
*text = "TLS confidentiality required";
return LDAP_CONFIDENTIALITY_REQUIRED;
}
}
}
- 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 */
)
{
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 ( !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_flags & SLAP_BFLAG_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,
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);
+ 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 );
}
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_flags & SLAP_BFLAG_GLUE_INSTANCE));
+ be = select_backend( edn, 0, 0 );
if (be == NULL) {
return LDAP_NO_SUCH_OBJECT;
projects / openldap / blobdiff