X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapi%2Fslapi_ops.c;h=3e32409ecf40e4adf29a0995d9fdf769ab298acf;hb=173330187ef1a4139e2e4c4fb30ad23832e40f77;hp=514f0e33891802cf2b4fec5996fb789e3dee3ba4;hpb=b299d7e06757a3f1a2fda945dc3cdbc28460179b;p=openldap
diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 514f0e3389..3e32409ecf 100644
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -1,21 +1,23 @@
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*
- * Copyright IBM Corp. 1997,2002
- * Use of this source code is subject to the terms of The OpenLDAP Public
- * License (version 2.7 or later).
- * No trademarks of the IBM Corporation are to be used to identify, endorse
- * or promote any products derived from this code without the prior
- * written consent of IBM
- */
-/*
- * Portions (C) Copyright PADL Software Pty Ltd. 2003
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2002-2005 The OpenLDAP Foundation.
+ * Portions Copyright 1997,2002-2003 IBM Corporation.
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this notice is preserved
- * and that due credit is given to PADL Software Pty Ltd. This software
- * is provided ``as is'' without express or implied warranty.
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by IBM Corporation for use in
+ * IBM products and subsequently ported to OpenLDAP Software by
+ * Steve Omrani. Additional significant contributors include:
+ * Luke Howard
*/
#include "portable.h"
@@ -59,12 +61,12 @@ internal_search_entry(
Operation *op,
SlapReply *rs )
{
- char *ent2str = NULL;
int nentries = 0, len = 0, i = 0;
Slapi_Entry **head = NULL, **tp;
-
- ent2str = slapi_entry2str( rs->sr_entry, &len );
- if ( ent2str == NULL ) {
+ Slapi_Entry *entry;
+
+ entry = slapi_entry_dup( rs->sr_entry );
+ if ( entry == NULL ) {
return 1;
}
@@ -77,24 +79,19 @@ internal_search_entry(
if ( nentries == 0 ) {
tp = (Slapi_Entry **)slapi_ch_malloc( 2 * sizeof(Slapi_Entry *) );
if ( tp == NULL ) {
+ slapi_entry_free( entry );
return 1;
}
- tp[ 0 ] = (Slapi_Entry *)str2entry( ent2str );
- if ( tp[ 0 ] == NULL ) {
- return 1;
- }
-
+ tp[ 0 ] = entry;
} else {
tp = (Slapi_Entry **)slapi_ch_realloc( (char *)head,
sizeof(Slapi_Entry *) * ( i + 1 ) );
if ( tp == NULL ) {
+ slapi_entry_free( entry );
return 1;
}
- tp[ i - 1 ] = (Slapi_Entry *)str2entry( ent2str );
- if ( tp[ i - 1 ] == NULL ) {
- return 1;
- }
+ tp[ i - 1 ] = entry;
}
tp[ i ] = NULL;
@@ -122,12 +119,12 @@ internal_search_reference(
return LDAP_SUCCESS;
}
-static Connection *
-slapiConnectionInit(
+Connection *
+slapi_int_init_connection(
char *DN,
int OpType )
{
- Connection *pConn, *c;
+ Connection *pConn;
ber_len_t max = sockbuf_max_incoming;
pConn = (Connection *) slapi_ch_calloc(1, sizeof(Connection));
@@ -152,84 +149,92 @@ slapiConnectionInit(
return (Connection *)NULL;
}
- c = pConn;
-
- /* operation object */
- c->c_pending_ops.stqh_first->o_tag = OpType;
- c->c_pending_ops.stqh_first->o_protocol = LDAP_VERSION3;
- c->c_pending_ops.stqh_first->o_authmech.bv_val = NULL;
- c->c_pending_ops.stqh_first->o_authmech.bv_len = 0;
- c->c_pending_ops.stqh_first->o_time = slap_get_time();
- c->c_pending_ops.stqh_first->o_do_not_cache = 1;
- c->c_pending_ops.stqh_first->o_threadctx = ldap_pvt_thread_pool_context();
- c->c_pending_ops.stqh_first->o_tmpmemctx = NULL;
- c->c_pending_ops.stqh_first->o_tmpmfuncs = &ch_mfuncs;
- c->c_pending_ops.stqh_first->o_conn = c;
-
/* connection object */
- c->c_authmech.bv_val = NULL;
- c->c_authmech.bv_len = 0;
- c->c_dn.bv_val = NULL;
- c->c_dn.bv_len = 0;
- c->c_ndn.bv_val = NULL;
- c->c_ndn.bv_len = 0;
- c->c_groups = NULL;
+ pConn->c_authmech.bv_val = NULL;
+ pConn->c_authmech.bv_len = 0;
+ pConn->c_dn.bv_val = NULL;
+ pConn->c_dn.bv_len = 0;
+ pConn->c_ndn.bv_val = NULL;
+ pConn->c_ndn.bv_len = 0;
- c->c_listener = &slap_unknown_listener;
- ber_dupbv( &c->c_peer_domain, (struct berval *)&slap_unknown_bv );
- ber_dupbv( &c->c_peer_name, (struct berval *)&slap_unknown_bv );
+ pConn->c_listener = &slap_unknown_listener;
+ ber_dupbv( &pConn->c_peer_domain, (struct berval *)&slap_unknown_bv );
+ ber_dupbv( &pConn->c_peer_name, (struct berval *)&slap_unknown_bv );
- LDAP_STAILQ_INIT( &c->c_ops );
+ LDAP_STAILQ_INIT( &pConn->c_ops );
- c->c_sasl_bind_mech.bv_val = NULL;
- c->c_sasl_bind_mech.bv_len = 0;
- c->c_sasl_authctx = NULL;
- c->c_sasl_sockctx = NULL;
- c->c_sasl_extra = NULL;
+ pConn->c_sasl_bind_mech.bv_val = NULL;
+ pConn->c_sasl_bind_mech.bv_len = 0;
+ pConn->c_sasl_authctx = NULL;
+ pConn->c_sasl_sockctx = NULL;
+ pConn->c_sasl_extra = NULL;
- c->c_sb = ber_sockbuf_alloc( );
+ pConn->c_sb = ber_sockbuf_alloc( );
- ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
+ ber_sockbuf_ctrl( pConn->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
- c->c_currentber = NULL;
+ pConn->c_currentber = NULL;
/* should check status of thread calls */
- ldap_pvt_thread_mutex_init( &c->c_mutex );
- ldap_pvt_thread_mutex_init( &c->c_write_mutex );
- ldap_pvt_thread_cond_init( &c->c_write_cv );
+ ldap_pvt_thread_mutex_init( &pConn->c_mutex );
+ ldap_pvt_thread_mutex_init( &pConn->c_write_mutex );
+ ldap_pvt_thread_cond_init( &pConn->c_write_cv );
- c->c_n_ops_received = 0;
- c->c_n_ops_executing = 0;
- c->c_n_ops_pending = 0;
- c->c_n_ops_completed = 0;
+ ldap_pvt_thread_mutex_lock( &pConn->c_mutex );
- c->c_n_get = 0;
- c->c_n_read = 0;
- c->c_n_write = 0;
+ pConn->c_n_ops_received = 0;
+ pConn->c_n_ops_executing = 0;
+ pConn->c_n_ops_pending = 0;
+ pConn->c_n_ops_completed = 0;
- c->c_protocol = LDAP_VERSION3;
+ pConn->c_n_get = 0;
+ pConn->c_n_read = 0;
+ pConn->c_n_write = 0;
- c->c_activitytime = c->c_starttime = slap_get_time();
+ pConn->c_protocol = LDAP_VERSION3;
- c->c_connid = 0;
+ pConn->c_activitytime = pConn->c_starttime = slap_get_time();
- c->c_conn_state = 0x01; /* SLAP_C_ACTIVE */
- c->c_struct_state = 0x02; /* SLAP_C_USED */
+ /*
+ * A real connection ID is required, because syncrepl associates
+ * pending CSNs with unique ( connection, operation ) tuples.
+ * Setting a fake connection ID will cause slap_get_commit_csn()
+ * to return a stale value.
+ */
+ connection_assign_nextid( pConn );
+
+ pConn->c_conn_state = 0x01; /* SLAP_C_ACTIVE */
+ pConn->c_struct_state = 0x02; /* SLAP_C_USED */
- c->c_ssf = c->c_transport_ssf = 0;
- c->c_tls_ssf = 0;
+ pConn->c_ssf = pConn->c_transport_ssf = 0;
+ pConn->c_tls_ssf = 0;
- backend_connection_init( c );
+ backend_connection_init( pConn );
pConn->c_send_ldap_result = internal_result_v3;
pConn->c_send_search_entry = internal_search_entry;
pConn->c_send_ldap_extended = internal_result_ext;
pConn->c_send_search_reference = internal_search_reference;
+ /* operation object */
+ pConn->c_pending_ops.stqh_first->o_tag = OpType;
+ pConn->c_pending_ops.stqh_first->o_protocol = LDAP_VERSION3;
+ pConn->c_pending_ops.stqh_first->o_authmech.bv_val = NULL;
+ pConn->c_pending_ops.stqh_first->o_authmech.bv_len = 0;
+ pConn->c_pending_ops.stqh_first->o_time = slap_get_time();
+ pConn->c_pending_ops.stqh_first->o_do_not_cache = 1;
+ pConn->c_pending_ops.stqh_first->o_threadctx = ldap_pvt_thread_pool_context();
+ pConn->c_pending_ops.stqh_first->o_tmpmemctx = NULL;
+ pConn->c_pending_ops.stqh_first->o_tmpmfuncs = &ch_mfuncs;
+ pConn->c_pending_ops.stqh_first->o_conn = pConn;
+ pConn->c_pending_ops.stqh_first->o_connid = pConn->c_connid;
+
+ ldap_pvt_thread_mutex_unlock( &pConn->c_mutex );
+
return pConn;
}
-static void slapiConnectionDestroy( Connection **pConn )
+void slapi_int_connection_destroy( Connection **pConn )
{
Connection *conn = *pConn;
Operation *op;
@@ -240,6 +245,8 @@ static void slapiConnectionDestroy( Connection **pConn )
op = (Operation *)conn->c_pending_ops.stqh_first;
+ slap_graduate_commit_csn( op );
+
if ( op->o_req_dn.bv_val != NULL ) {
slapi_ch_free( (void **)&op->o_req_dn.bv_val );
}
@@ -275,7 +282,7 @@ values2obj_copy(
}
for ( i = 0; ppValue[i] != NULL; i++ )
- ;
+ ; /* EMPTY */
tmpberval = (BerVarray)slapi_ch_malloc( (i+1) * (sizeof(struct berval)) );
if ( tmpberval == NULL ) {
@@ -301,19 +308,18 @@ bvptr2obj_copy(
struct berval **bvptr,
BerVarray *bvobj )
{
- int rc = LDAP_SUCCESS;
int i;
BerVarray tmpberval;
- if ( bvptr == NULL || *bvptr == NULL ) {
- return LDAP_OTHER;
+ if ( bvptr == NULL ) {
+ *bvobj = NULL;
+ return LDAP_SUCCESS;
}
- for ( i = 0; bvptr != NULL && bvptr[i] != NULL; i++ ) {
+ for ( i = 0; bvptr[i] != NULL; i++ )
; /* EMPTY */
- }
- tmpberval = (BerVarray)slapi_ch_malloc( (i + 1)*sizeof(struct berval));
+ tmpberval = (BerVarray)slapi_ch_malloc( (i + 1) * sizeof(struct berval));
if ( tmpberval == NULL ) {
return LDAP_NO_MEMORY;
}
@@ -323,30 +329,30 @@ bvptr2obj_copy(
tmpberval[i].bv_len = bvptr[i]->bv_len;
AC_MEMCPY( tmpberval[i].bv_val, bvptr[i]->bv_val, bvptr[i]->bv_len );
}
+
tmpberval[i].bv_val = NULL;
tmpberval[i].bv_len = 0;
- if ( rc == LDAP_SUCCESS ) {
- *bvobj = tmpberval;
- }
+ *bvobj = tmpberval;
- return rc;
+ return LDAP_SUCCESS;
}
/*
- * Function : LDAPModToEntry
+ * Function : slapi_int_ldapmod_to_entry
* convert a dn plus an array of LDAPMod struct ptrs to an entry structure
* with a link list of the correspondent attributes.
* Return value : LDAP_SUCCESS
* LDAP_NO_MEMORY
* LDAP_OTHER
*/
-Entry *
-LDAPModToEntry(
+static Entry *
+slapi_int_ldapmod_to_entry(
+ Connection *pConn,
char *ldn,
LDAPMod **mods )
{
- struct berval dn = { 0, NULL };
+ struct berval dn = BER_BVNULL;
Entry *pEntry=NULL;
LDAPMod *pMod;
struct berval *bv;
@@ -361,13 +367,7 @@ LDAPModToEntry(
const char *text = NULL;
-
- op = (Operation *) slapi_ch_calloc(1, sizeof(Operation));
- if ( op == NULL) {
- rc = LDAP_NO_MEMORY;
- goto cleanup;
- }
- op->o_tag = LDAP_REQ_ADD;
+ op = (Operation *)pConn->c_pending_ops.stqh_first;
pEntry = (Entry *) ch_calloc( 1, sizeof(Entry) );
if ( pEntry == NULL) {
@@ -400,7 +400,7 @@ LDAPModToEntry(
if ( rc != LDAP_SUCCESS ) goto cleanup;
tmp.sml_type.bv_val = pMod->mod_type;
tmp.sml_type.bv_len = strlen( pMod->mod_type );
- tmp.sml_bvalues = bv;
+ tmp.sml_values = bv;
tmp.sml_nvalues = NULL;
mod = (Modifications *) ch_malloc( sizeof(Modifications) );
@@ -409,7 +409,7 @@ LDAPModToEntry(
mod->sml_next = NULL;
mod->sml_desc = NULL;
mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
+ mod->sml_values = tmp.sml_values;
mod->sml_nvalues = tmp.sml_nvalues;
*modtail = mod;
@@ -425,7 +425,7 @@ LDAPModToEntry(
if ( rc != LDAP_SUCCESS ) goto cleanup;
tmp.sml_type.bv_val = pMod->mod_type;
tmp.sml_type.bv_len = strlen( pMod->mod_type );
- tmp.sml_bvalues = bv;
+ tmp.sml_values = bv;
tmp.sml_nvalues = NULL;
mod = (Modifications *) ch_malloc( sizeof(Modifications) );
@@ -434,7 +434,7 @@ LDAPModToEntry(
mod->sml_next = NULL;
mod->sml_desc = NULL;
mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
+ mod->sml_values = tmp.sml_values;
mod->sml_nvalues = tmp.sml_nvalues;
*modtail = mod;
@@ -448,22 +448,30 @@ LDAPModToEntry(
if ( op->o_bd == NULL ) {
rc = LDAP_PARTIAL_RESULTS;
} else {
- int repl_user = be_isupdate( op->o_bd, &op->o_bd->be_rootdn );
+ int repl_user = be_isupdate_dn( op->o_bd, &op->o_bd->be_rootdn );
if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) {
- int update = op->o_bd->be_update_ndn.bv_len;
- char textbuf[SLAP_TEXT_BUFLEN];
- size_t textlen = sizeof textbuf;
+ int update = !BER_BVISNULL( &op->o_bd->be_update_ndn );
+ char textbuf[ SLAP_TEXT_BUFLEN ];
+ size_t textlen = sizeof( textbuf );
- rc = slap_mods_check( modlist, update, &text,
+ rc = slap_mods_check( modlist, &text,
textbuf, textlen, NULL );
if ( rc != LDAP_SUCCESS) {
goto cleanup;
}
+ if ( !update ) {
+ rc = slap_mods_no_update_check( modlist,
+ &text, textbuf, textlen );
+ if ( rc != LDAP_SUCCESS) {
+ goto cleanup;
+ }
+ }
+
if ( !repl_user ) {
rc = slap_mods_opattrs( op,
modlist, modtail, &text,
- textbuf, textlen );
+ textbuf, textlen, 1 );
if ( rc != LDAP_SUCCESS) {
goto cleanup;
}
@@ -484,8 +492,6 @@ cleanup:
if ( dn.bv_val )
slapi_ch_free( (void **)&dn.bv_val );
- if ( op )
- slapi_ch_free( (void **)&op );
if ( modlist != NULL )
slap_mods_free( modlist );
if ( rc != LDAP_SUCCESS ) {
@@ -518,11 +524,10 @@ slapi_delete_internal(
Connection *pConn = NULL;
Operation *op = NULL;
Slapi_PBlock *pPB = NULL;
- Slapi_PBlock *pSavePB = NULL;
SlapReply rs = { REP_RESULT };
- struct berval dn = { 0, NULL };
+ struct berval dn = BER_BVNULL;
- int manageDsaIt = 0;
+ int manageDsaIt = SLAP_CONTROL_NONE;
int isCritical;
if ( ldn == NULL ) {
@@ -530,7 +535,7 @@ slapi_delete_internal(
goto cleanup;
}
- pConn = slapiConnectionInit( NULL, LDAP_REQ_DELETE );
+ pConn = slapi_int_init_connection( NULL, LDAP_REQ_DELETE );
if (pConn == NULL) {
rs.sr_err = LDAP_NO_MEMORY;
goto cleanup;
@@ -548,10 +553,10 @@ slapi_delete_internal(
if ( slapi_control_present( controls,
SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical) ) {
- manageDsaIt = 1;
+ manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL;
}
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
+ op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 );
if ( op->o_bd == NULL ) {
rs.sr_err = LDAP_PARTIAL_RESULTS;
goto cleanup;
@@ -561,13 +566,11 @@ slapi_delete_internal(
op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn;
if ( op->o_bd->be_delete ) {
- int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+ int repl_user = be_isupdate( op );
if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) {
- if ( (*op->o_bd->be_delete)( op, &rs ) == 0 ) {
- if ( log_change ) {
- replog( op );
- }
- } else {
+ slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
+ if ( log_change ) op->o_callback = &cb;
+ if ( (*op->o_bd->be_delete)( op, &rs ) ) {
rs.sr_err = LDAP_OTHER;
}
} else {
@@ -584,13 +587,10 @@ cleanup:
if ( dn.bv_val ) {
slapi_ch_free( (void **)&dn.bv_val );
}
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
- slapiConnectionDestroy( &pConn );
+ slapi_int_connection_destroy( &pConn );
- return (pSavePB);
+ return pPB;
#else
return NULL;
#endif /* LDAP_SLAPI */
@@ -598,16 +598,16 @@ cleanup:
#ifdef LDAP_SLAPI
static Slapi_PBlock *
-slapi_add_entry_internal_locked(
+slapi_int_add_entry_locked(
+ Connection *pConn,
Slapi_Entry **e,
LDAPControl **controls,
int log_changes )
{
- Connection *pConn = NULL;
Operation *op = NULL;
- Slapi_PBlock *pPB = NULL, *pSavePB = NULL;
+ Slapi_PBlock *pPB = NULL;
- int manageDsaIt = 0;
+ int manageDsaIt = SLAP_CONTROL_NONE;
int isCritical;
SlapReply rs = { REP_RESULT };
@@ -615,23 +615,17 @@ slapi_add_entry_internal_locked(
rs.sr_err = LDAP_PARAM_ERROR;
goto cleanup;
}
-
- pConn = slapiConnectionInit( NULL, LDAP_REQ_ADD );
- if ( pConn == NULL ) {
- rs.sr_err = LDAP_NO_MEMORY;
- goto cleanup;
- }
if ( slapi_control_present( controls, LDAP_CONTROL_MANAGEDSAIT,
NULL, &isCritical ) ) {
- manageDsaIt = 1;
+ manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL;
}
op = (Operation *)pConn->c_pending_ops.stqh_first;
pPB = (Slapi_PBlock *)op->o_pb;
op->o_ctrls = controls;
- op->o_bd = select_backend( &((*e)->e_nname), manageDsaIt, 0 );
+ op->o_bd = select_backend( &((*e)->e_nname), manageDsaIt, 1 );
if ( op->o_bd == NULL ) {
rs.sr_err = LDAP_PARTIAL_RESULTS;
goto cleanup;
@@ -642,12 +636,11 @@ slapi_add_entry_internal_locked(
op->oq_add.rs_e = *e;
if ( op->o_bd->be_add ) {
- int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+ int repl_user = be_isupdate( op );
if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) {
+ slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
+ if ( log_changes ) op->o_callback = &cb;
if ( (*op->o_bd->be_add)( op, &rs ) == 0 ) {
- if ( log_changes ) {
- replog( op );
- }
be_entry_release_w( op, *e );
*e = NULL;
}
@@ -659,18 +652,11 @@ slapi_add_entry_internal_locked(
}
cleanup:
-
if ( pPB != NULL ) {
slapi_pblock_set( pPB, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
}
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
-
- slapiConnectionDestroy( &pConn );
-
- return( pSavePB );
+ return( pPB );
}
#endif /* LDAP_SLAPI */
@@ -681,18 +667,27 @@ slapi_add_entry_internal(
int log_changes )
{
#ifdef LDAP_SLAPI
- Slapi_PBlock *pb;
- Slapi_Entry *entry;
+ Slapi_PBlock *pb = NULL;
+ Slapi_Entry *entry = NULL;
+ Connection *pConn = NULL;
+
+ pConn = slapi_int_init_connection( NULL, LDAP_REQ_ADD );
+ if ( pConn == NULL ) {
+ return NULL;
+ }
/*
* We make a copy to avoid an entry that may be freed later
* by the caller being placed in the cache.
*/
entry = slapi_entry_dup( e );
- pb = slapi_add_entry_internal_locked( &entry, controls, log_changes );
+ pb = slapi_int_add_entry_locked( pConn, &entry, controls, log_changes );
if ( entry != NULL ) {
slapi_entry_free( entry );
}
+
+ slapi_int_connection_destroy( &pConn );
+
return pb;
#else
return NULL;
@@ -708,6 +703,7 @@ slapi_add_internal(
{
#ifdef LDAP_SLAPI
LDAPMod *pMod = NULL;
+ Connection *pConn = NULL;
Slapi_PBlock *pb = NULL;
Entry *pEntry = NULL;
int i, rc = LDAP_SUCCESS;
@@ -718,7 +714,7 @@ slapi_add_internal(
if ( rc == LDAP_SUCCESS ) {
for ( i = 0, pMod = mods[0]; pMod != NULL; pMod = mods[++i] ) {
- if ( (pMod->mod_op & ~LDAP_MOD_BVALUES) != LDAP_MOD_ADD ) {
+ if ( (pMod->mod_op & LDAP_MOD_OP ) != LDAP_MOD_ADD ) {
rc = LDAP_OTHER;
break;
}
@@ -726,9 +722,12 @@ slapi_add_internal(
}
if ( rc == LDAP_SUCCESS ) {
- pEntry = LDAPModToEntry( dn, mods );
- if ( pEntry == NULL ) {
- rc = LDAP_OTHER;
+ pConn = slapi_int_init_connection( NULL, LDAP_REQ_ADD );
+ if ( pConn != NULL ) {
+ pEntry = slapi_int_ldapmod_to_entry( pConn, dn, mods );
+ if ( pEntry == NULL ) {
+ rc = LDAP_OTHER;
+ }
}
}
@@ -736,14 +735,16 @@ slapi_add_internal(
pb = slapi_pblock_new();
slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rc );
} else {
- pb = slapi_add_entry_internal_locked( &pEntry, controls, log_changes );
+ pb = slapi_int_add_entry_locked( pConn, &pEntry, controls, log_changes );
}
if ( pEntry != NULL ) {
- slapi_entry_free(pEntry);
+ slapi_entry_free( pEntry );
}
- return(pb);
+ slapi_int_connection_destroy( &pConn );
+
+ return pb;
#else
return NULL;
#endif /* LDAP_SLAPI */
@@ -770,17 +771,16 @@ slapi_modrdn_internal(
int log_change )
{
#ifdef LDAP_SLAPI
- struct berval dn = { 0, NULL };
- struct berval newrdn = { 0, NULL };
+ struct berval dn = BER_BVNULL;
+ struct berval newrdn = BER_BVNULL;
Connection *pConn = NULL;
Operation *op = NULL;
Slapi_PBlock *pPB = NULL;
- Slapi_PBlock *pSavePB = NULL;
- int manageDsaIt = 0;
+ int manageDsaIt = SLAP_CONTROL_NONE;
int isCritical;
SlapReply rs = { REP_RESULT };
- pConn = slapiConnectionInit( NULL, LDAP_REQ_MODRDN);
+ pConn = slapi_int_init_connection( NULL, LDAP_REQ_MODRDN );
if ( pConn == NULL) {
rs.sr_err = LDAP_NO_MEMORY;
goto cleanup;
@@ -792,10 +792,10 @@ slapi_modrdn_internal(
if ( slapi_control_present( controls,
SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical ) ) {
- manageDsaIt = 1;
+ manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL;
}
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
+ op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 );
if ( op->o_bd == NULL ) {
rs.sr_err = LDAP_PARTIAL_RESULTS;
goto cleanup;
@@ -825,7 +825,7 @@ slapi_modrdn_internal(
goto cleanup;
}
- if ( rdnValidate( &op->oq_modrdn.rs_nnewrdn ) != LDAP_SUCCESS ) {
+ if ( rdn_validate( &op->oq_modrdn.rs_nnewrdn ) != LDAP_SUCCESS ) {
goto cleanup;
}
@@ -834,13 +834,11 @@ slapi_modrdn_internal(
op->oq_modrdn.rs_deleteoldrdn = deloldrdn;
if ( op->o_bd->be_modrdn ) {
- int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+ int repl_user = be_isupdate( op );
if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) {
- if ( (*op->o_bd->be_modrdn)( op, &rs ) == 0 ) {
- if ( log_change ) {
- replog( op );
- }
- } else {
+ slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
+ if ( log_change ) op->o_callback = &cb;
+ if ( (*op->o_bd->be_modrdn)( op, &rs ) ) {
rs.sr_err = LDAP_OTHER;
}
} else {
@@ -866,13 +864,9 @@ cleanup:
if ( op->oq_modrdn.rs_nnewrdn.bv_val )
slapi_ch_free( (void **)&op->oq_modrdn.rs_nnewrdn.bv_val );
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
-
- slapiConnectionDestroy( &pConn );
+ slapi_int_connection_destroy( &pConn );
- return( pSavePB );
+ return pPB;
#else
return NULL;
#endif /* LDAP_SLAPI */
@@ -900,11 +894,10 @@ slapi_modify_internal(
Connection *pConn = NULL;
Operation *op = NULL;
Slapi_PBlock *pPB = NULL;
- Slapi_PBlock *pSavePB = NULL;
- struct berval dn = { 0, NULL };
+ struct berval dn = BER_BVNULL;
- int manageDsaIt = 0;
+ int manageDsaIt = SLAP_CONTROL_NONE;
int isCritical;
struct berval *bv;
LDAPMod *pMod;
@@ -920,7 +913,7 @@ slapi_modify_internal(
goto cleanup;
}
- pConn = slapiConnectionInit( NULL, LDAP_REQ_MODIFY );
+ pConn = slapi_int_init_connection( NULL, LDAP_REQ_MODIFY );
if ( pConn == NULL ) {
rs.sr_err = LDAP_NO_MEMORY;
goto cleanup;
@@ -939,10 +932,10 @@ slapi_modify_internal(
if ( slapi_control_present( controls,
SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical ) ) {
- manageDsaIt = 1;
+ manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL;
}
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
+ op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 );
if ( op->o_bd == NULL ) {
rs.sr_err = LDAP_PARTIAL_RESULTS;
goto cleanup;
@@ -968,16 +961,16 @@ slapi_modify_internal(
goto cleanup;
tmp.sml_type.bv_val = pMod->mod_type;
tmp.sml_type.bv_len = strlen( pMod->mod_type );
- tmp.sml_bvalues = bv;
+ tmp.sml_values = bv;
tmp.sml_nvalues = NULL;
mod = (Modifications *)ch_malloc( sizeof(Modifications) );
- mod->sml_op = pMod->mod_op;
+ mod->sml_op = pMod->mod_op & LDAP_MOD_OP;
mod->sml_next = NULL;
mod->sml_desc = NULL;
mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
+ mod->sml_values = tmp.sml_values;
mod->sml_nvalues = tmp.sml_nvalues;
} else {
rs.sr_err = values2obj_copy( pMod->mod_values, &bv );
@@ -985,24 +978,24 @@ slapi_modify_internal(
goto cleanup;
tmp.sml_type.bv_val = pMod->mod_type;
tmp.sml_type.bv_len = strlen( pMod->mod_type );
- tmp.sml_bvalues = bv;
+ tmp.sml_values = bv;
tmp.sml_nvalues = NULL;
mod = (Modifications *) ch_malloc( sizeof(Modifications) );
- mod->sml_op = pMod->mod_op;
+ mod->sml_op = pMod->mod_op & LDAP_MOD_OP;
mod->sml_next = NULL;
mod->sml_desc = NULL;
mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
+ mod->sml_values = tmp.sml_values;
mod->sml_nvalues = tmp.sml_nvalues;
}
*modtail = mod;
modtail = &mod->sml_next;
- switch( pMod->mod_op ) {
+ switch( pMod->mod_op & LDAP_MOD_OP ) {
case LDAP_MOD_ADD:
- if ( mod->sml_bvalues == NULL ) {
+ if ( mod->sml_values == NULL ) {
rs.sr_err = LDAP_PROTOCOL_ERROR;
goto cleanup;
}
@@ -1010,6 +1003,7 @@ slapi_modify_internal(
/* fall through */
case LDAP_MOD_DELETE:
case LDAP_MOD_REPLACE:
+ case LDAP_MOD_INCREMENT:
break;
default:
@@ -1027,32 +1021,38 @@ slapi_modify_internal(
op->oq_modify.rs_modlist = modlist;
if ( op->o_bd->be_modify ) {
- int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
+ int repl_user = be_isupdate( op );
if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) {
- int update = op->o_bd->be_update_ndn.bv_len;
- const char *text = NULL;
- char textbuf[SLAP_TEXT_BUFLEN];
- size_t textlen = sizeof( textbuf );
+ int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
+ const char *text = NULL;
+ char textbuf[ SLAP_TEXT_BUFLEN ];
+ size_t textlen = sizeof( textbuf );
+ slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
- rs.sr_err = slap_mods_check( modlist, update,
+ rs.sr_err = slap_mods_check( modlist,
&text, textbuf, textlen, NULL );
if ( rs.sr_err != LDAP_SUCCESS ) {
goto cleanup;
}
+ if ( !update ) {
+ rs.sr_err = slap_mods_no_update_check( modlist,
+ &text, textbuf, textlen );
+ if ( rs.sr_err != LDAP_SUCCESS ) {
+ goto cleanup;
+ }
+ }
+
if ( !repl_user ) {
rs.sr_err = slap_mods_opattrs( op, modlist,
modtail, &text, textbuf,
- textlen );
+ textlen, 1 );
if ( rs.sr_err != LDAP_SUCCESS ) {
goto cleanup;
}
}
- if ( (*op->o_bd->be_modify)( op, &rs ) == 0 ) {
- if ( log_change ) {
- replog( op );
- }
- } else {
+ if ( log_change ) op->o_callback = &cb;
+ if ( (*op->o_bd->be_modify)( op, &rs ) ) {
rs.sr_err = LDAP_OTHER;
}
} else {
@@ -1073,21 +1073,16 @@ cleanup:
if ( modlist != NULL )
slap_mods_free( modlist );
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
-
- slapiConnectionDestroy( &pConn );
+ slapi_int_connection_destroy( &pConn );
- return ( pSavePB );
+ return pPB;
#else
return NULL;
#endif /* LDAP_SLAPI */
}
Slapi_PBlock *
-slapi_search_internal_bind(
- char *bindDN,
+slapi_search_internal(
char *ldn,
int scope,
char *filStr,
@@ -1098,28 +1093,27 @@ slapi_search_internal_bind(
#ifdef LDAP_SLAPI
Connection *c;
Operation *op = NULL;
- Slapi_PBlock *ptr = NULL;
- Slapi_PBlock *pSavePB = NULL;
- struct berval dn = { 0, NULL };
+ Slapi_PBlock *pPB = NULL;
+ struct berval dn = BER_BVNULL;
Filter *filter=NULL;
- struct berval fstr = { 0, NULL };
+ struct berval fstr = BER_BVNULL;
AttributeName *an = NULL;
const char *text = NULL;
- int manageDsaIt = 0;
+ int manageDsaIt = SLAP_CONTROL_NONE;
int isCritical;
int i;
SlapReply rs = { REP_RESULT };
- c = slapiConnectionInit( NULL, LDAP_REQ_SEARCH );
+ c = slapi_int_init_connection( NULL, LDAP_REQ_SEARCH );
if ( c == NULL ) {
rs.sr_err = LDAP_NO_MEMORY;
goto cleanup;
}
op = (Operation *)c->c_pending_ops.stqh_first;
- ptr = (Slapi_PBlock *)op->o_pb;
+ pPB = (Slapi_PBlock *)op->o_pb;
op->o_ctrls = controls;
if ( ldn != NULL ) {
@@ -1156,6 +1150,7 @@ slapi_search_internal_bind(
for (i = 0; attrs[i] != 0; i++) {
an[i].an_desc = NULL;
an[i].an_oc = NULL;
+ an[i].an_oc_exclude = 0;
an[i].an_name.bv_val = slapi_ch_strdup(attrs[i]);
an[i].an_name.bv_len = strlen(attrs[i]);
slap_bv2ad( &an[i].an_name, &an[i].an_desc, &text );
@@ -1185,6 +1180,8 @@ slapi_search_internal_bind(
rs.sr_type = REP_SEARCH;
rs.sr_err = LDAP_SUCCESS;
rs.sr_attrs = an;
+ rs.sr_operational_attrs = NULL;
+ rs.sr_flags = REP_ENTRY_MODIFIABLE;
send_search_entry( op, &rs );
}
@@ -1210,12 +1207,12 @@ slapi_search_internal_bind(
if ( slapi_control_present( controls,
LDAP_CONTROL_MANAGEDSAIT, NULL, &isCritical ) ) {
- manageDsaIt = 1;
+ manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL;
}
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
+ op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 );
if ( op->o_bd == NULL ) {
- if ( manageDsaIt == 1 ) {
+ if ( manageDsaIt > SLAP_CONTROL_NONE ) {
rs.sr_err = LDAP_NO_SUCH_OBJECT;
} else {
rs.sr_err = LDAP_PARTIAL_RESULTS;
@@ -1228,8 +1225,8 @@ slapi_search_internal_bind(
op->oq_search.rs_scope = scope;
op->oq_search.rs_deref = 0;
- op->oq_search.rs_slimit = LDAP_NO_LIMIT;
- op->oq_search.rs_tlimit = LDAP_NO_LIMIT;
+ op->oq_search.rs_slimit = SLAP_NO_LIMIT;
+ op->oq_search.rs_tlimit = SLAP_NO_LIMIT;
op->oq_search.rs_attrsonly = attrsonly;
op->oq_search.rs_attrs = an;
op->oq_search.rs_filter = filter;
@@ -1245,8 +1242,8 @@ slapi_search_internal_bind(
cleanup:
- if ( ptr != NULL )
- slapi_pblock_set( ptr, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
+ if ( pPB != NULL )
+ slapi_pblock_set( pPB, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
if ( dn.bv_val )
slapi_ch_free( (void **)&dn.bv_val );
@@ -1257,30 +1254,9 @@ cleanup:
if ( an != NULL )
slapi_ch_free( (void **)&an );
- if ( c != NULL ) {
- pSavePB = ptr;
- }
+ slapi_int_connection_destroy( &c );
- slapiConnectionDestroy( &c );
-
- return( pSavePB );
-#else
- return NULL;
-#endif /* LDAP_SLAPI */
-}
-
-Slapi_PBlock *
-slapi_search_internal(
- char *base,
- int scope,
- char *filStr,
- LDAPControl **controls,
- char **attrs,
- int attrsonly )
-{
-#ifdef LDAP_SLAPI
- return slapi_search_internal_bind( NULL, base, scope, filStr,
- controls, attrs, attrsonly );
+ return pPB;
#else
return NULL;
#endif /* LDAP_SLAPI */