-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*
- * (C) Copyright IBM Corp. 1997,2002
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is
- * given to IBM Corporation. This software is provided ``as is''
- * without express or implied warranty.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2002-2008 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 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
+ * <http://www.OpenLDAP.org/license.html>.
*/
-/*
- * Portions (C) Copyright PADL Software Pty Ltd. 2003
- * Redistribution and use in source and binary forms 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.
+/* 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"
+
+#include <ac/string.h>
+#include <ac/stdarg.h>
+#include <ac/ctype.h>
+#include <ac/unistd.h>
+
#include <slap.h>
#include <lber_pvt.h>
#include <slapi.h>
-/*
- * use a fake listener when faking a connection,
- * so it can be used in ACLs
- */
-static struct slap_listener slap_unknown_listener = {
- BER_BVC("unknown"), /* FIXME: use a URI form? */
- BER_BVC("UNKNOWN")
+#ifdef LDAP_SLAPI
+
+static struct slap_listener slapi_listener = {
+ BER_BVC("slapi://"),
+ BER_BVC("slapi://")
};
-int bvptr2obj( struct berval **bvptr, struct berval **bvobj );
+static LDAPControl **
+slapi_int_dup_controls( LDAPControl **controls )
+{
+ LDAPControl **c;
+ size_t i;
-static void
-internal_result_v3(
+ if ( controls == NULL )
+ return NULL;
+
+ for ( i = 0; controls[i] != NULL; i++ )
+ ;
+
+ c = (LDAPControl **) slapi_ch_calloc( i + 1, sizeof(LDAPControl *) );
+
+ for ( i = 0; controls[i] != NULL; i++ ) {
+ c[i] = slapi_dup_control( controls[i] );
+ }
+
+ return c;
+}
+
+static int
+slapi_int_result(
Operation *op,
SlapReply *rs )
{
-#ifdef notdef
- /* XXX needs review after internal API change */
- /* rs->sr_nentries appears to always be 0 */
- if (op->o_tag == LDAP_REQ_SEARCH)
- slapi_pblock_set( (Slapi_PBlock *)op->o_pb,
- SLAPI_NENTRIES, (void *)rs->sr_nentries );
-#endif
-
- return;
+ Slapi_PBlock *pb = SLAPI_OPERATION_PBLOCK( op );
+ plugin_result_callback prc = NULL;
+ void *callback_data = NULL;
+ LDAPControl **ctrls = NULL;
+
+ assert( pb != NULL );
+
+ slapi_pblock_get( pb, SLAPI_X_INTOP_RESULT_CALLBACK, (void **)&prc );
+ slapi_pblock_get( pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data );
+
+ /* we need to duplicate controls because they might go out of scope */
+ ctrls = slapi_int_dup_controls( rs->sr_ctrls );
+ slapi_pblock_set( pb, SLAPI_RESCONTROLS, ctrls );
+
+ if ( prc != NULL ) {
+ (*prc)( rs->sr_err, callback_data );
+ }
+
+ return rs->sr_err;
}
static int
-internal_search_entry(
+slapi_int_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 ) {
- return 1;
+ Slapi_PBlock *pb = SLAPI_OPERATION_PBLOCK( op );
+ plugin_search_entry_callback psec = NULL;
+ void *callback_data = NULL;
+ int rc = LDAP_SUCCESS;
+
+ assert( pb != NULL );
+
+ slapi_pblock_get( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, (void **)&psec );
+ slapi_pblock_get( pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data );
+
+ if ( psec != NULL ) {
+ rc = (*psec)( rs->sr_entry, callback_data );
}
- slapi_pblock_get( (Slapi_PBlock *)op->o_pb,
- SLAPI_NENTRIES, &nentries );
- slapi_pblock_get( (Slapi_PBlock *)op->o_pb,
- SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &head );
-
- i = nentries + 1;
- if ( nentries == 0 ) {
- tp = (Slapi_Entry **)slapi_ch_malloc( 2 * sizeof(Slapi_Entry *) );
- if ( tp == NULL ) {
- return 1;
- }
+ return rc;
+}
- tp[ 0 ] = (Slapi_Entry *)str2entry( ent2str );
- if ( tp[ 0 ] == NULL ) {
- return 1;
- }
+static int
+slapi_int_search_reference(
+ Operation *op,
+ SlapReply *rs )
+{
+ int i, rc = LDAP_SUCCESS;
+ plugin_referral_entry_callback prec = NULL;
+ void *callback_data = NULL;
+ Slapi_PBlock *pb = SLAPI_OPERATION_PBLOCK( op );
- } else {
- tp = (Slapi_Entry **)slapi_ch_realloc( (char *)head,
- sizeof(Slapi_Entry *) * ( i + 1 ) );
- if ( tp == NULL ) {
- return 1;
- }
- tp[ i - 1 ] = (Slapi_Entry *)str2entry( ent2str );
- if ( tp[ i - 1 ] == NULL ) {
- return 1;
+ assert( pb != NULL );
+
+ slapi_pblock_get( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, (void **)&prec );
+ slapi_pblock_get( pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data );
+
+ if ( prec != NULL ) {
+ for ( i = 0; rs->sr_ref[i].bv_val != NULL; i++ ) {
+ rc = (*prec)( rs->sr_ref[i].bv_val, callback_data );
+ if ( rc != LDAP_SUCCESS ) {
+ break;
+ }
}
}
- tp[ i ] = NULL;
-
- slapi_pblock_set( (Slapi_PBlock *)op->o_pb,
- SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, (void *)tp );
- slapi_pblock_set( (Slapi_PBlock *)op->o_pb,
- SLAPI_NENTRIES, (void *)i );
- return LDAP_SUCCESS;
+ return rc;
}
-static void
-internal_result_ext(
- Operation *op,
- SlapReply *sr )
+int
+slapi_int_response( Slapi_Operation *op, SlapReply *rs )
{
- return;
+ int rc;
+
+ switch ( rs->sr_type ) {
+ case REP_RESULT:
+ rc = slapi_int_result( op, rs );
+ break;
+ case REP_SEARCH:
+ rc = slapi_int_search_entry( op, rs );
+ break;
+ case REP_SEARCHREF:
+ rc = slapi_int_search_reference( op, rs );
+ break;
+ default:
+ rc = LDAP_OTHER;
+ break;
+ }
+
+ assert( rc != SLAP_CB_CONTINUE ); /* never try to send a wire response */
+
+ return rc;
}
static int
-internal_search_reference(
- Operation *op,
- SlapReply *sr )
+slapi_int_get_ctrls( Slapi_PBlock *pb )
{
- return LDAP_SUCCESS;
-}
+ LDAPControl **c;
+ int rc = LDAP_SUCCESS;
-static Connection *
-slapiConnectionInit(
- char *DN,
- int OpType )
-{
- Connection *pConn, *c;
- ber_len_t max = sockbuf_max_incoming;
-
- pConn = (Connection *) slapi_ch_calloc(1, sizeof(Connection));
- if (pConn == NULL) {
- return (Connection *)NULL;
+ if ( pb->pb_op->o_ctrls != NULL ) {
+ for ( c = pb->pb_op->o_ctrls; *c != NULL; c++ ) {
+ rc = slap_parse_ctrl( pb->pb_op, pb->pb_rs, *c, &pb->pb_rs->sr_text );
+ if ( rc != LDAP_SUCCESS )
+ break;
+ }
}
- LDAP_STAILQ_INIT( &pConn->c_pending_ops );
+ return rc;
+}
+
+void
+slapi_int_connection_init_pb( Slapi_PBlock *pb, ber_tag_t tag )
+{
+ Connection *conn;
+ Operation *op;
+ ber_len_t max = sockbuf_max_incoming;
- pConn->c_pending_ops.stqh_first =
- (Operation *) slapi_ch_calloc( 1, sizeof(Operation) );
- if ( pConn->c_pending_ops.stqh_first == NULL ) {
- slapi_ch_free( (void **)&pConn );
- return (Connection *)NULL;
- }
+ conn = (Connection *) slapi_ch_calloc( 1, sizeof(Connection) );
- pConn->c_pending_ops.stqh_first->o_pb =
- (Slapi_PBlock *) slapi_pblock_new();
- if ( pConn->c_pending_ops.stqh_first->o_pb == NULL ) {
- slapi_ch_free( (void **)&pConn->c_pending_ops.stqh_first );
- slapi_ch_free( (void **)&pConn );
- return (Connection *)NULL;
- }
+ LDAP_STAILQ_INIT( &conn->c_pending_ops );
- c = pConn;
+ op = (Operation *) slapi_ch_calloc( 1, OPERATION_BUFFER_SIZE );
+ op->o_hdr = (Opheader *)(op + 1);
+ op->o_controls = (void **)(op->o_hdr + 1);
- /* 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( &connection_pool );
- 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;
-
- 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 );
-
- LDAP_STAILQ_INIT( &c->c_ops );
-
- c->c_sasl_bind_mech.bv_val = NULL;
- c->c_sasl_bind_mech.bv_len = 0;
- c->c_sasl_context = NULL;
- c->c_sasl_extra = NULL;
-
- c->c_sb = ber_sockbuf_alloc( );
-
- ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
-
- c->c_currentber = NULL;
+ op->o_callback = (slap_callback *) slapi_ch_calloc( 1, sizeof(slap_callback) );
+ op->o_callback->sc_response = slapi_int_response;
+ op->o_callback->sc_cleanup = NULL;
+ op->o_callback->sc_private = pb;
+ op->o_callback->sc_next = NULL;
+
+ conn->c_pending_ops.stqh_first = op;
+
+ /* connection object authorization information */
+ conn->c_authtype = LDAP_AUTH_NONE;
+ BER_BVZERO( &conn->c_authmech );
+ BER_BVZERO( &conn->c_dn );
+ BER_BVZERO( &conn->c_ndn );
+
+ conn->c_listener = &slapi_listener;
+ ber_dupbv( &conn->c_peer_domain, (struct berval *)&slap_unknown_bv );
+ ber_dupbv( &conn->c_peer_name, (struct berval *)&slap_unknown_bv );
+
+ LDAP_STAILQ_INIT( &conn->c_ops );
+
+ BER_BVZERO( &conn->c_sasl_bind_mech );
+ conn->c_sasl_authctx = NULL;
+ conn->c_sasl_sockctx = NULL;
+ conn->c_sasl_extra = NULL;
+
+ conn->c_sb = ber_sockbuf_alloc();
+
+ ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
+
+ conn->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( &conn->c_mutex );
+ ldap_pvt_thread_mutex_init( &conn->c_write_mutex );
+ ldap_pvt_thread_cond_init( &conn->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( &conn->c_mutex );
- c->c_n_get = 0;
- c->c_n_read = 0;
- c->c_n_write = 0;
+ conn->c_n_ops_received = 0;
+ conn->c_n_ops_executing = 0;
+ conn->c_n_ops_pending = 0;
+ conn->c_n_ops_completed = 0;
- c->c_protocol = LDAP_VERSION3;
+ conn->c_n_get = 0;
+ conn->c_n_read = 0;
+ conn->c_n_write = 0;
- c->c_activitytime = c->c_starttime = slap_get_time();
+ conn->c_protocol = LDAP_VERSION3;
- c->c_connid = 0;
+ conn->c_activitytime = conn->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( conn );
- c->c_ssf = c->c_transport_ssf = 0;
- c->c_tls_ssf = 0;
+ conn->c_conn_state = 0x01; /* SLAP_C_ACTIVE */
+ conn->c_struct_state = 0x02; /* SLAP_C_USED */
- backend_connection_init( c );
+ conn->c_ssf = conn->c_transport_ssf = local_ssf;
+ conn->c_tls_ssf = 0;
- 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;
+ backend_connection_init( conn );
- return pConn;
+ conn->c_send_ldap_result = slap_send_ldap_result;
+ conn->c_send_search_entry = slap_send_search_entry;
+ conn->c_send_ldap_extended = slap_send_ldap_extended;
+ conn->c_send_search_reference = slap_send_search_reference;
+
+ /* operation object */
+ op->o_tag = tag;
+ op->o_protocol = LDAP_VERSION3;
+ BER_BVZERO( &op->o_authmech );
+ op->o_time = slap_get_time();
+ op->o_do_not_cache = 1;
+ op->o_threadctx = ldap_pvt_thread_pool_context();
+ op->o_tmpmemctx = NULL;
+ op->o_tmpmfuncs = &ch_mfuncs;
+ op->o_conn = conn;
+ op->o_connid = conn->c_connid;
+ op->o_bd = frontendDB;
+
+ /* extensions */
+ slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+ slapi_int_create_object_extensions( SLAPI_X_EXT_CONNECTION, conn );
+
+ pb->pb_rs = (SlapReply *)slapi_ch_calloc( 1, sizeof(SlapReply) );
+ pb->pb_op = op;
+ pb->pb_conn = conn;
+ pb->pb_intop = 1;
+
+ ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
}
-static void slapiConnectionDestroy( Connection **pConn )
+static void
+slapi_int_set_operation_dn( Slapi_PBlock *pb )
{
- Connection *conn = *pConn;
- Operation *op;
-
- if ( pConn == NULL ) {
- return;
+ Backend *be;
+ Operation *op = pb->pb_op;
+
+ if ( BER_BVISNULL( &op->o_ndn ) ) {
+ /* set to root DN */
+ be = select_backend( &op->o_req_ndn, get_manageDSAit( op ), 1 );
+ if ( be != NULL ) {
+ ber_dupbv( &op->o_dn, &be->be_rootdn );
+ ber_dupbv( &op->o_ndn, &be->be_rootndn );
+ }
}
+}
- op = (Operation *)conn->c_pending_ops.stqh_first;
+void
+slapi_int_connection_done_pb( Slapi_PBlock *pb )
+{
+ Connection *conn;
+ Operation *op;
- if ( op->o_req_dn.bv_val != NULL ) {
- slapi_ch_free( (void **)&op->o_req_dn.bv_val );
- }
- if ( op->o_req_ndn.bv_val != NULL ) {
- slapi_ch_free( (void **)&op->o_req_ndn.bv_val );
+ PBLOCK_ASSERT_INTOP( pb, 0 );
+
+ conn = pb->pb_conn;
+ op = pb->pb_op;
+
+ /* free allocated DNs */
+ if ( !BER_BVISNULL( &op->o_dn ) )
+ op->o_tmpfree( op->o_dn.bv_val, op->o_tmpmemctx );
+ if ( !BER_BVISNULL( &op->o_ndn ) )
+ op->o_tmpfree( op->o_ndn.bv_val, op->o_tmpmemctx );
+
+ if ( !BER_BVISNULL( &op->o_req_dn ) )
+ op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+ if ( !BER_BVISNULL( &op->o_req_ndn ) )
+ op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+
+ switch ( op->o_tag ) {
+ case LDAP_REQ_MODRDN:
+ if ( !BER_BVISNULL( &op->orr_newrdn ))
+ op->o_tmpfree( op->orr_newrdn.bv_val, op->o_tmpmemctx );
+ if ( !BER_BVISNULL( &op->orr_nnewrdn ))
+ op->o_tmpfree( op->orr_nnewrdn.bv_val, op->o_tmpmemctx );
+ if ( op->orr_newSup != NULL ) {
+ assert( !BER_BVISNULL( op->orr_newSup ) );
+ op->o_tmpfree( op->orr_newSup->bv_val, op->o_tmpmemctx );
+ op->o_tmpfree( op->orr_newSup, op->o_tmpmemctx );
+ }
+ if ( op->orr_nnewSup != NULL ) {
+ assert( !BER_BVISNULL( op->orr_nnewSup ) );
+ op->o_tmpfree( op->orr_nnewSup->bv_val, op->o_tmpmemctx );
+ op->o_tmpfree( op->orr_nnewSup, op->o_tmpmemctx );
+ }
+ break;
+ case LDAP_REQ_ADD:
+ slap_mods_free( op->ora_modlist, 0 );
+ break;
+ case LDAP_REQ_MODIFY:
+ slap_mods_free( op->orm_modlist, 1 );
+ break;
+ case LDAP_REQ_SEARCH:
+ if ( op->ors_attrs != NULL ) {
+ op->o_tmpfree( op->ors_attrs, op->o_tmpmemctx );
+ op->ors_attrs = NULL;
+ }
+ break;
+ default:
+ break;
}
+ slapi_ch_free_string( &conn->c_authmech.bv_val );
+ slapi_ch_free_string( &conn->c_dn.bv_val );
+ slapi_ch_free_string( &conn->c_ndn.bv_val );
+ slapi_ch_free_string( &conn->c_peer_domain.bv_val );
+ slapi_ch_free_string( &conn->c_peer_name.bv_val );
+
if ( conn->c_sb != NULL ) {
ber_sockbuf_free( conn->c_sb );
}
- if ( op != NULL ) {
- slapi_ch_free( (void **)&op );
- }
- slapi_ch_free( (void **)pConn );
+
+ slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
+ slapi_int_free_object_extensions( SLAPI_X_EXT_CONNECTION, conn );
+
+ slapi_ch_free( (void **)&pb->pb_op->o_callback );
+ slapi_ch_free( (void **)&pb->pb_op );
+ slapi_ch_free( (void **)&pb->pb_conn );
+ slapi_ch_free( (void **)&pb->pb_rs );
}
-/*
- * Function : values2obj
- * Convert an array of strings into a BerVarray.
- * the strings.
- */
static int
-values2obj(
- char **ppValue,
- BerVarray *bvobj)
+slapi_int_func_internal_pb( Slapi_PBlock *pb, slap_operation_t which )
{
- int i;
- BerVarray tmpberval;
+ BI_op_bind **func;
+ SlapReply *rs = pb->pb_rs;
+ int rc;
- if ( ppValue == NULL ) {
- *bvobj = NULL;
- return LDAP_SUCCESS;
- }
+ PBLOCK_ASSERT_INTOP( pb, 0 );
- for ( i = 0; ppValue[i] != NULL; i++ )
- ;
-
- tmpberval = (BerVarray)slapi_ch_malloc( (i+1) * (sizeof(struct berval)) );
- if ( tmpberval == NULL ) {
- return LDAP_NO_MEMORY;
- }
- for ( i = 0; ppValue[i] != NULL; i++ ) {
- tmpberval[i].bv_val = ppValue[i];
- tmpberval[i].bv_len = strlen( ppValue[i] );
+ rc = slapi_int_get_ctrls( pb );
+ if ( rc != LDAP_SUCCESS ) {
+ rs->sr_err = rc;
+ return rc;
}
- tmpberval[i].bv_val = NULL;
- tmpberval[i].bv_len = 0;
- *bvobj = tmpberval;
+ pb->pb_op->o_bd = frontendDB;
+ func = &frontendDB->be_bind;
- return LDAP_SUCCESS;
+ return func[which]( pb->pb_op, pb->pb_rs );
}
-static void
-freeMods( Modifications *ml )
+int
+slapi_delete_internal_pb( Slapi_PBlock *pb )
{
- /*
- * Free a modification list whose values have been
- * set with bvptr2obj() or values2obj() (ie. they
- * do not own the pointer to the underlying values)
- */
- Modifications *next;
+ if ( pb == NULL ) {
+ return -1;
+ }
- for ( ; ml != NULL; ml = next ) {
- next = ml->sml_next;
+ PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_DELETE );
- slapi_ch_free( (void **)&ml->sml_bvalues );
- slapi_ch_free( (void **)&ml->sml_nvalues );
- slapi_ch_free( (void **)&ml );
- }
+ slapi_int_func_internal_pb( pb, op_delete );
+
+ return 0;
}
-/*
- * Function : LDAPModToEntry
- * 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(
- char *ldn,
- LDAPMod **mods )
+int
+slapi_add_internal_pb( Slapi_PBlock *pb )
{
- struct berval dn = { 0, NULL };
- Entry *pEntry=NULL;
- LDAPMod *pMod;
- struct berval *bv;
- Operation *op;
+ SlapReply *rs;
+ Slapi_Entry *entry_orig = NULL;
- Modifications *modlist = NULL;
- Modifications **modtail = &modlist;
- Modifications tmp;
+ if ( pb == NULL ) {
+ return -1;
+ }
- int rc = LDAP_SUCCESS;
- int i;
+ PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_ADD );
- const char *text = NULL;
+ rs = pb->pb_rs;
+ entry_orig = pb->pb_op->ora_e;
+ pb->pb_op->ora_e = NULL;
- op = (Operation *) slapi_ch_calloc(1, sizeof(Operation));
- if ( pEntry == NULL) {
- rc = LDAP_NO_MEMORY;
- goto cleanup;
- }
- op->o_tag = LDAP_REQ_ADD;
+ /*
+ * The caller can specify a new entry, or a target DN and set
+ * of modifications, but not both.
+ */
+ if ( entry_orig != NULL ) {
+ if ( pb->pb_op->ora_modlist != NULL || !BER_BVISNULL( &pb->pb_op->o_req_ndn )) {
+ rs->sr_err = LDAP_PARAM_ERROR;
+ goto cleanup;
+ }
- pEntry = (Entry *) ch_calloc( 1, sizeof(Entry) );
- if ( pEntry == NULL) {
- rc = LDAP_NO_MEMORY;
+ assert( BER_BVISNULL( &pb->pb_op->o_req_dn ) ); /* shouldn't get set */
+ ber_dupbv( &pb->pb_op->o_req_dn, &entry_orig->e_name );
+ ber_dupbv( &pb->pb_op->o_req_ndn, &entry_orig->e_nname );
+ } else if ( pb->pb_op->ora_modlist == NULL || BER_BVISNULL( &pb->pb_op->o_req_ndn )) {
+ rs->sr_err = LDAP_PARAM_ERROR;
goto cleanup;
- }
+ }
- dn.bv_val = slapi_ch_strdup(ldn);
- dn.bv_len = strlen(ldn);
+ pb->pb_op->ora_e = (Entry *)slapi_ch_calloc( 1, sizeof(Entry) );
+ ber_dupbv( &pb->pb_op->ora_e->e_name, &pb->pb_op->o_req_dn );
+ ber_dupbv( &pb->pb_op->ora_e->e_nname, &pb->pb_op->o_req_ndn );
- rc = dnPrettyNormal( NULL, &dn, &pEntry->e_name, &pEntry->e_nname );
- if ( rc != LDAP_SUCCESS )
- goto cleanup;
+ if ( entry_orig != NULL ) {
+ assert( pb->pb_op->ora_modlist == NULL );
- if ( rc == LDAP_SUCCESS ) {
- for ( i=0, pMod=mods[0]; rc == LDAP_SUCCESS && pMod != NULL; pMod=mods[++i]) {
- Modifications *mod;
- if ( (pMod->mod_op & LDAP_MOD_BVALUES) != 0 ) {
- /* attr values are in berval format */
- /* convert an array of pointers to bervals to an array of bervals */
- rc = bvptr2obj(pMod->mod_bvalues, &bv);
- 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_nvalues = NULL;
-
- mod = (Modifications *) ch_malloc( sizeof(Modifications) );
-
- mod->sml_op = LDAP_MOD_ADD;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
- mod->sml_nvalues = tmp.sml_nvalues;
-
- *modtail = mod;
- modtail = &mod->sml_next;
-
- } else {
- /* attr values are in string format, need to be converted */
- /* to an array of bervals */
- if ( pMod->mod_values == NULL ) {
- rc = LDAP_OTHER;
- } else {
- rc = values2obj( pMod->mod_values, &bv );
- 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_nvalues = NULL;
-
- mod = (Modifications *) ch_malloc( sizeof(Modifications) );
-
- mod->sml_op = LDAP_MOD_ADD;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
- mod->sml_nvalues = tmp.sml_nvalues;
-
- *modtail = mod;
- modtail = &mod->sml_next;
- }
- }
- } /* for each LDAPMod */
+ rs->sr_err = slap_entry2mods( entry_orig, &pb->pb_op->ora_modlist,
+ &rs->sr_text, pb->pb_textbuf, sizeof( pb->pb_textbuf ) );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ goto cleanup;
+ }
+ } else {
+ assert( pb->pb_op->ora_modlist != NULL );
}
- op->o_bd = select_backend( &pEntry->e_nname, 0, 0 );
- if ( op->o_bd == NULL ) {
- rc = LDAP_PARTIAL_RESULTS;
- } else {
- int repl_user = be_isupdate( 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;
-
- rc = slap_mods_check( modlist, update, &text,
- textbuf, textlen );
- if ( rc != LDAP_SUCCESS) {
- goto cleanup;
- }
+ rs->sr_err = slap_mods_check( pb->pb_op->ora_modlist, &rs->sr_text,
+ pb->pb_textbuf, sizeof( pb->pb_textbuf ), NULL );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ goto cleanup;
+ }
- if ( !repl_user ) {
- rc = slap_mods_opattrs( op,
- modlist, modtail, &text,
- textbuf, textlen );
- if ( rc != LDAP_SUCCESS) {
- goto cleanup;
- }
- }
+ /* Duplicate the values, because we may call slapi_entry_free() */
+ rs->sr_err = slap_mods2entry( pb->pb_op->ora_modlist, &pb->pb_op->ora_e,
+ 1, 0, &rs->sr_text, pb->pb_textbuf, sizeof( pb->pb_textbuf ) );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ goto cleanup;
+ }
- /*
- * FIXME: slap_mods2entry is declared static
- * in servers/slapd/add.c
- */
- rc = slap_mods2entry( modlist, &pEntry, repl_user,
- &text, textbuf, textlen );
- if (rc != LDAP_SUCCESS) {
- goto cleanup;
- }
+ if ( slapi_int_func_internal_pb( pb, op_add ) == 0 ) {
+ if ( pb->pb_op->ora_e != NULL && pb->pb_op->o_private != NULL ) {
+ BackendDB *bd = pb->pb_op->o_bd;
- } else {
- rc = LDAP_REFERRAL;
+ pb->pb_op->o_bd = (BackendDB *)pb->pb_op->o_private;
+ pb->pb_op->o_private = NULL;
+ be_entry_release_w( pb->pb_op, pb->pb_op->ora_e );
+ pb->pb_op->ora_e = NULL;
+ pb->pb_op->o_bd = bd;
+ pb->pb_op->o_private = NULL;
}
}
cleanup:
- if ( dn.bv_val )
- slapi_ch_free( (void **)&dn.bv_val );
- if ( op )
- slapi_ch_free( (void **)&op );
- if ( modlist != NULL )
- freeMods( modlist );
- if ( rc != LDAP_SUCCESS ) {
- if ( pEntry != NULL ) {
- slapi_entry_free( pEntry );
- }
- pEntry = NULL;
+ if ( pb->pb_op->ora_e != NULL ) {
+ slapi_entry_free( pb->pb_op->ora_e );
+ pb->pb_op->ora_e = NULL;
+ }
+ if ( entry_orig != NULL ) {
+ pb->pb_op->ora_e = entry_orig;
+ slap_mods_free( pb->pb_op->ora_modlist, 1 );
+ pb->pb_op->ora_modlist = NULL;
}
- return( pEntry );
+ return 0;
}
-/* Function : slapi_delete_internal
- *
- * Description : Plugin functions call this routine to delete an entry
- * in the backend directly
- * Return values : LDAP_SUCCESS
- * LDAP_PARAM_ERROR
- * LDAP_NO_MEMORY
- * LDAP_OTHER
- * LDAP_UNWILLING_TO_PERFORM
-*/
-Slapi_PBlock *
-slapi_delete_internal(
- char *ldn,
- LDAPControl **controls,
- int log_change )
+int
+slapi_modrdn_internal_pb( Slapi_PBlock *pb )
{
-#ifdef LDAP_SLAPI
- Connection *pConn = NULL;
- Operation *op = NULL;
- Slapi_PBlock *pPB = NULL;
- Slapi_PBlock *pSavePB = NULL;
- SlapReply rs = { REP_RESULT };
- struct berval dn = { 0, NULL };
-
- int manageDsaIt = 0;
- int isCritical;
-
- if ( ldn == NULL ) {
- rs.sr_err = LDAP_PARAM_ERROR;
- goto cleanup;
+ if ( pb == NULL ) {
+ return -1;
}
- pConn = slapiConnectionInit( NULL, LDAP_REQ_DELETE );
- if (pConn == NULL) {
- rs.sr_err = LDAP_NO_MEMORY;
- goto cleanup;
- }
-
- op = (Operation *)pConn->c_pending_ops.stqh_first;
- pPB = (Slapi_PBlock *)op->o_pb;
- op->o_ctrls = controls;
-
- dn.bv_val = slapi_ch_strdup(ldn);
- dn.bv_len = strlen(ldn);
- rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn );
- if ( rs.sr_err != LDAP_SUCCESS )
- goto cleanup;
-
- if ( slapi_control_present( controls,
- SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical) ) {
- manageDsaIt = 1;
- }
+ PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_MODRDN );
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
- if ( op->o_bd == NULL ) {
- rs.sr_err = LDAP_PARTIAL_RESULTS;
+ if ( BER_BVISEMPTY( &pb->pb_op->o_req_ndn ) ) {
+ pb->pb_rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
goto cleanup;
}
- op->o_dn = pConn->c_dn = op->o_bd->be_rootdn;
- 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 );
- 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 {
- rs.sr_err = LDAP_OTHER;
- }
- } else {
- rs.sr_err = LDAP_REFERRAL;
- }
- } else {
- rs.sr_err = LDAP_UNWILLING_TO_PERFORM;
- }
+ slapi_int_func_internal_pb( pb, op_modrdn );
cleanup:
- 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 );
- }
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
-
- slapiConnectionDestroy( &pConn );
- return (pSavePB);
-#else
- return NULL;
-#endif /* LDAP_SLAPI */
+ return 0;
}
-Slapi_PBlock *
-slapi_add_entry_internal(
- Slapi_Entry *e,
- LDAPControl **controls,
- int log_changes )
+int
+slapi_modify_internal_pb( Slapi_PBlock *pb )
{
-#ifdef LDAP_SLAPI
- Connection *pConn = NULL;
- Operation *op = NULL;
- Slapi_PBlock *pPB = NULL, *pSavePB = NULL;
-
- int manageDsaIt = 0;
- int isCritical;
- SlapReply rs = { REP_RESULT };
+ SlapReply *rs;
- if ( e == NULL ) {
- 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 ( pb == NULL ) {
+ return -1;
}
- if ( slapi_control_present( controls, LDAP_CONTROL_MANAGEDSAIT,
- NULL, &isCritical ) ) {
- manageDsaIt = 1;
- }
+ PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_MODIFY );
- op = (Operation *)pConn->c_pending_ops.stqh_first;
- pPB = (Slapi_PBlock *)op->o_pb;
- op->o_ctrls = controls;
+ rs = pb->pb_rs;
- op->o_bd = select_backend( &e->e_nname, manageDsaIt, 0 );
- if ( op->o_bd == NULL ) {
- rs.sr_err = LDAP_PARTIAL_RESULTS;
+ if ( pb->pb_op->orm_modlist == NULL ) {
+ rs->sr_err = LDAP_PARAM_ERROR;
goto cleanup;
}
- op->o_dn = pConn->c_dn = op->o_bd->be_rootdn;
- op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn;
- op->oq_add.rs_e = e;
-
- if ( op->o_bd->be_add ) {
- int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
- if ( !op->o_bd->be_update_ndn.bv_len || repl_user ){
- if ( (*op->o_bd->be_add)( op, &rs ) == 0 ) {
- if ( log_changes ) {
- replog( op );
- }
- }
- } else {
- rs.sr_err = LDAP_REFERRAL;
- }
- } else {
- rs.sr_err = LDAP_UNWILLING_TO_PERFORM;
+ if ( BER_BVISEMPTY( &pb->pb_op->o_req_ndn ) ) {
+ rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ goto cleanup;
}
-cleanup:
-
- if ( pPB != NULL ) {
- slapi_pblock_set( pPB, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
- }
+ rs->sr_err = slap_mods_check( pb->pb_op->orm_modlist,
+ &rs->sr_text, pb->pb_textbuf, sizeof( pb->pb_textbuf ), NULL );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ goto cleanup;
+ }
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
+ slapi_int_func_internal_pb( pb, op_modify );
- slapiConnectionDestroy( &pConn );
+cleanup:
- return( pSavePB );
-#else
- return NULL;
-#endif /* LDAP_SLAPI */
+ return 0;
}
-
-Slapi_PBlock *
-slapi_add_internal(
- char *dn,
- LDAPMod **mods,
- LDAPControl **controls,
- int log_changes )
+static int
+slapi_int_search_entry_callback( Slapi_Entry *entry, void *callback_data )
{
-#ifdef LDAP_SLAPI
- LDAPMod *pMod = NULL;
- Slapi_PBlock *pb = NULL;
- Entry *pEntry = NULL;
- int i, rc = LDAP_SUCCESS;
+ int nentries = 0, i = 0;
+ Slapi_Entry **head = NULL, **tp;
+ Slapi_PBlock *pb = (Slapi_PBlock *)callback_data;
- if ( mods == NULL || *mods == NULL || dn == NULL || *dn == '\0' ) {
- rc = LDAP_PARAM_ERROR ;
- }
+ PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_SEARCH );
- 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 ) {
- rc = LDAP_OTHER;
- break;
- }
- }
+ entry = slapi_entry_dup( entry );
+ if ( entry == NULL ) {
+ return LDAP_NO_MEMORY;
}
- if ( rc == LDAP_SUCCESS ) {
- if((pEntry = LDAPModToEntry( dn, mods )) == NULL) {
- rc = LDAP_OTHER;
+ slapi_pblock_get( pb, SLAPI_NENTRIES, &nentries );
+ slapi_pblock_get( pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &head );
+
+ i = nentries + 1;
+ if ( nentries == 0 ) {
+ tp = (Slapi_Entry **)slapi_ch_malloc( 2 * sizeof(Slapi_Entry *) );
+ if ( tp == NULL ) {
+ slapi_entry_free( entry );
+ return LDAP_NO_MEMORY;
}
- }
- if ( rc != LDAP_SUCCESS ) {
- pb = slapi_pblock_new();
- slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rc );
+ tp[0] = entry;
} else {
- pb = slapi_add_entry_internal( pEntry, controls, log_changes );
- }
-
- if ( pEntry ) {
- slapi_entry_free(pEntry);
+ tp = (Slapi_Entry **)slapi_ch_realloc( (char *)head,
+ sizeof(Slapi_Entry *) * ( i + 1 ) );
+ if ( tp == NULL ) {
+ slapi_entry_free( entry );
+ return LDAP_NO_MEMORY;
+ }
+ tp[i - 1] = entry;
}
+ tp[i] = NULL;
+
+ slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, (void *)tp );
+ slapi_pblock_set( pb, SLAPI_NENTRIES, (void *)&i );
- return(pb);
-#else
- return NULL;
-#endif /* LDAP_SLAPI */
+ return LDAP_SUCCESS;
}
-/* Function : slapi_modrdn_internal
- *
- * Description : Plugin functions call this routine to modify the rdn
- * of an entry in the backend directly
- * Return values : LDAP_SUCCESS
- * LDAP_PARAM_ERROR
- * LDAP_NO_MEMORY
- * LDAP_OTHER
- * LDAP_UNWILLING_TO_PERFORM
- *
- * NOTE: This function does not support the "newSuperior" option from LDAP V3.
- */
-Slapi_PBlock *
-slapi_modrdn_internal(
- char *olddn,
- char *lnewrdn,
- int deloldrdn,
- LDAPControl **controls,
- int log_change )
+int
+slapi_search_internal_pb( Slapi_PBlock *pb )
{
-#ifdef LDAP_SLAPI
- struct berval dn = { 0, NULL };
- struct berval newrdn = { 0, NULL };
- Connection *pConn = NULL;
- Operation *op = NULL;
- Slapi_PBlock *pPB = NULL;
- Slapi_PBlock *pSavePB = NULL;
- int manageDsaIt = 0;
- int isCritical;
- SlapReply rs = { REP_RESULT };
-
- pConn = slapiConnectionInit( NULL, LDAP_REQ_MODRDN);
- if ( pConn == NULL) {
- rs.sr_err = LDAP_NO_MEMORY;
- goto cleanup;
- }
+ return slapi_search_internal_callback_pb( pb,
+ (void *)pb,
+ NULL,
+ slapi_int_search_entry_callback,
+ NULL );
+}
- op = (Operation *)pConn->c_pending_ops.stqh_first;
- pPB = (Slapi_PBlock *)op->o_pb;
- op->o_ctrls = controls;
+int
+slapi_search_internal_callback_pb( Slapi_PBlock *pb,
+ void *callback_data,
+ plugin_result_callback prc,
+ plugin_search_entry_callback psec,
+ plugin_referral_entry_callback prec )
+{
+ int free_filter = 0;
+ SlapReply *rs;
- if ( slapi_control_present( controls,
- SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical ) ) {
- manageDsaIt = 1;
+ if ( pb == NULL ) {
+ return -1;
}
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
- if ( op->o_bd == NULL ) {
- rs.sr_err = LDAP_PARTIAL_RESULTS;
- goto cleanup;
- }
+ PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_SEARCH );
- op->o_dn = pConn->c_dn = op->o_bd->be_rootdn;
- op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn;
+ rs = pb->pb_rs;
- dn.bv_val = slapi_ch_strdup( olddn );
- dn.bv_len = strlen( olddn );
+ /* search callback and arguments */
+ slapi_pblock_set( pb, SLAPI_X_INTOP_RESULT_CALLBACK, (void *)prc );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, (void *)psec );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, (void *)prec );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_CALLBACK_DATA, (void *)callback_data );
- rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn );
- if ( rs.sr_err != LDAP_SUCCESS ) {
+ if ( BER_BVISEMPTY( &pb->pb_op->ors_filterstr )) {
+ rs->sr_err = LDAP_PARAM_ERROR;
goto cleanup;
}
- if ( op->o_req_dn.bv_len == 0 ) {
- rs.sr_err = LDAP_UNWILLING_TO_PERFORM;
- goto cleanup;
+ if ( pb->pb_op->ors_filter == NULL ) {
+ pb->pb_op->ors_filter = slapi_str2filter( pb->pb_op->ors_filterstr.bv_val );
+ if ( pb->pb_op->ors_filter == NULL ) {
+ rs->sr_err = LDAP_PROTOCOL_ERROR;
+ goto cleanup;
+ }
+
+ free_filter = 1;
}
- newrdn.bv_val = slapi_ch_strdup( lnewrdn );
- newrdn.bv_len = strlen( lnewrdn );
+ slapi_int_func_internal_pb( pb, op_search );
- rs.sr_err = dnPrettyNormal( NULL, &newrdn, &op->oq_modrdn.rs_newrdn, &op->oq_modrdn.rs_nnewrdn );
- if ( rs.sr_err != LDAP_SUCCESS ) {
- goto cleanup;
+cleanup:
+ if ( free_filter ) {
+ slapi_filter_free( pb->pb_op->ors_filter, 1 );
+ pb->pb_op->ors_filter = NULL;
}
- if ( rdnValidate( &op->oq_modrdn.rs_nnewrdn ) != LDAP_SUCCESS ) {
- goto cleanup;
- }
+ slapi_pblock_delete_param( pb, SLAPI_X_INTOP_RESULT_CALLBACK );
+ slapi_pblock_delete_param( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK );
+ slapi_pblock_delete_param( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK );
+ slapi_pblock_delete_param( pb, SLAPI_X_INTOP_CALLBACK_DATA );
- op->oq_modrdn.rs_newSup = NULL;
- op->oq_modrdn.rs_nnewSup = NULL;
- op->oq_modrdn.rs_deleteoldrdn = deloldrdn;
-
- if ( op->o_bd->be_modrdn ) {
- int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
- 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 {
- rs.sr_err = LDAP_OTHER;
- }
- } else {
- rs.sr_err = LDAP_REFERRAL;
- }
- } else {
- rs.sr_err = LDAP_UNWILLING_TO_PERFORM;
- }
+ return 0;
+}
-cleanup:
+/* Wrappers for old API */
- 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 );
-
- if ( newrdn.bv_val )
- slapi_ch_free( (void **)&newrdn.bv_val );
- if ( op->oq_modrdn.rs_newrdn.bv_val )
- slapi_ch_free( (void **)&op->oq_modrdn.rs_newrdn.bv_val );
- if ( op->oq_modrdn.rs_nnewrdn.bv_val )
- slapi_ch_free( (void **)&op->oq_modrdn.rs_nnewrdn.bv_val );
-
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
+void
+slapi_search_internal_set_pb( Slapi_PBlock *pb,
+ const char *base,
+ int scope,
+ const char *filter,
+ char **attrs,
+ int attrsonly,
+ LDAPControl **controls,
+ const char *uniqueid,
+ Slapi_ComponentId *plugin_identity,
+ int operation_flags )
+{
+ int no_limit = SLAP_NO_LIMIT;
+ int deref = LDAP_DEREF_NEVER;
+
+ slapi_int_connection_init_pb( pb, LDAP_REQ_SEARCH );
+ slapi_pblock_set( pb, SLAPI_SEARCH_TARGET, (void *)base );
+ slapi_pblock_set( pb, SLAPI_SEARCH_SCOPE, (void *)&scope );
+ slapi_pblock_set( pb, SLAPI_SEARCH_FILTER, (void *)0 );
+ slapi_pblock_set( pb, SLAPI_SEARCH_STRFILTER, (void *)filter );
+ slapi_pblock_set( pb, SLAPI_SEARCH_ATTRS, (void *)attrs );
+ slapi_pblock_set( pb, SLAPI_SEARCH_ATTRSONLY, (void *)&attrsonly );
+ slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls );
+ slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid );
+ slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)&operation_flags );
+ slapi_pblock_set( pb, SLAPI_SEARCH_DEREF, (void *)&deref );
+ slapi_pblock_set( pb, SLAPI_SEARCH_SIZELIMIT, (void *)&no_limit );
+ slapi_pblock_set( pb, SLAPI_SEARCH_TIMELIMIT, (void *)&no_limit );
+
+ slapi_int_set_operation_dn( pb );
+}
+
+Slapi_PBlock *
+slapi_search_internal(
+ char *ldn,
+ int scope,
+ char *filStr,
+ LDAPControl **controls,
+ char **attrs,
+ int attrsonly )
+{
+ Slapi_PBlock *pb;
- slapiConnectionDestroy( &pConn );
+ pb = slapi_pblock_new();
- return( pSavePB );
-#else
- return NULL;
-#endif /* LDAP_SLAPI */
+ slapi_search_internal_set_pb( pb, ldn, scope, filStr,
+ attrs, attrsonly,
+ controls, NULL, NULL, 0 );
+
+ slapi_search_internal_pb( pb );
+
+ return pb;
+}
+
+void
+slapi_modify_internal_set_pb( Slapi_PBlock *pb,
+ const char *dn,
+ LDAPMod **mods,
+ LDAPControl **controls,
+ const char *uniqueid,
+ Slapi_ComponentId *plugin_identity,
+ int operation_flags )
+{
+ slapi_int_connection_init_pb( pb, LDAP_REQ_MODIFY );
+ slapi_pblock_set( pb, SLAPI_MODIFY_TARGET, (void *)dn );
+ slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)mods );
+ slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls );
+ slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid );
+ slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)&operation_flags );
+ slapi_int_set_operation_dn( pb );
}
/* Function : slapi_modify_internal
LDAPControl **controls,
int log_change )
{
-#ifdef LDAP_SLAPI
- int i;
- Connection *pConn = NULL;
- Operation *op = NULL;
- Slapi_PBlock *pPB = NULL;
- Slapi_PBlock *pSavePB = NULL;
-
- struct berval dn = { 0, NULL };
+ Slapi_PBlock *pb;
- int manageDsaIt = 0;
- int isCritical;
- struct berval *bv;
- LDAPMod *pMod;
+ pb = slapi_pblock_new();
- Modifications *modlist = NULL;
- Modifications **modtail = &modlist;
- Modifications tmp;
+ slapi_modify_internal_set_pb( pb, ldn, mods, controls, NULL, NULL, 0 );
+ slapi_pblock_set( pb, SLAPI_LOG_OPERATION, (void *)&log_change );
+ slapi_modify_internal_pb( pb );
- SlapReply rs = { REP_RESULT };
-
- if ( mods == NULL || *mods == NULL || ldn == NULL ) {
- rs.sr_err = LDAP_PARAM_ERROR ;
- goto cleanup;
- }
-
- pConn = slapiConnectionInit( NULL, LDAP_REQ_MODIFY );
- if ( pConn == NULL ) {
- rs.sr_err = LDAP_NO_MEMORY;
- goto cleanup;
- }
-
- op = (Operation *)pConn->c_pending_ops.stqh_first;
- pPB = (Slapi_PBlock *)op->o_pb;
- op->o_ctrls = controls;
-
- dn.bv_val = slapi_ch_strdup( ldn );
- dn.bv_len = strlen( ldn );
- rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn );
- if ( rs.sr_err != LDAP_SUCCESS ) {
- goto cleanup;
- }
-
- if ( slapi_control_present( controls,
- SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical ) ) {
- manageDsaIt = 1;
- }
+ return pb;
+}
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
- if ( op->o_bd == NULL ) {
- rs.sr_err = LDAP_PARTIAL_RESULTS;
- goto cleanup;
- }
-
- op->o_dn = pConn->c_dn = op->o_bd->be_rootdn;
- op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn;
-
- for ( i = 0, pMod = mods[0];
- rs.sr_err == LDAP_SUCCESS && pMod != NULL;
- pMod = mods[++i] )
- {
- Modifications *mod;
-
- if ( (pMod->mod_op & LDAP_MOD_BVALUES) != 0 ) {
- /*
- * attr values are in berval format
- * convert an array of pointers to bervals
- * to an array of bervals
- */
- rs.sr_err = bvptr2obj( pMod->mod_bvalues, &bv );
- if ( rs.sr_err != 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_nvalues = NULL;
-
- mod = (Modifications *)ch_malloc( sizeof(Modifications) );
-
- mod->sml_op = pMod->mod_op;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
- mod->sml_nvalues = tmp.sml_nvalues;
- } else {
- rs.sr_err = values2obj( pMod->mod_values, &bv );
- if ( rs.sr_err != 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_nvalues = NULL;
-
- mod = (Modifications *) ch_malloc( sizeof(Modifications) );
-
- mod->sml_op = pMod->mod_op;
- mod->sml_next = NULL;
- mod->sml_desc = NULL;
- mod->sml_type = tmp.sml_type;
- mod->sml_bvalues = tmp.sml_bvalues;
- mod->sml_nvalues = tmp.sml_nvalues;
- }
- *modtail = mod;
- modtail = &mod->sml_next;
+int
+slapi_add_internal_set_pb( Slapi_PBlock *pb,
+ const char *dn,
+ LDAPMod **attrs,
+ LDAPControl **controls,
+ Slapi_ComponentId *plugin_identity,
+ int operation_flags )
+{
+ slapi_int_connection_init_pb( pb, LDAP_REQ_ADD );
+ slapi_pblock_set( pb, SLAPI_ADD_TARGET, (void *)dn );
+ slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)attrs );
+ slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls );
+ slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)&operation_flags );
+ slapi_int_set_operation_dn( pb );
+
+ return 0;
+}
- switch( pMod->mod_op ) {
- case LDAP_MOD_ADD:
- if ( mod->sml_bvalues == NULL ) {
- rs.sr_err = LDAP_PROTOCOL_ERROR;
- goto cleanup;
- }
+Slapi_PBlock *
+slapi_add_internal(
+ char * dn,
+ LDAPMod **attrs,
+ LDAPControl **controls,
+ int log_change )
+{
+ Slapi_PBlock *pb;
- /* fall through */
- case LDAP_MOD_DELETE:
- case LDAP_MOD_REPLACE:
- break;
+ pb = slapi_pblock_new();
- default:
- rs.sr_err = LDAP_PROTOCOL_ERROR;
- goto cleanup;
- }
- }
- *modtail = NULL;
+ slapi_add_internal_set_pb( pb, dn, attrs, controls, NULL, 0);
+ slapi_pblock_set( pb, SLAPI_LOG_OPERATION, (void *)&log_change );
+ slapi_add_internal_pb( pb );
- if ( op->o_req_ndn.bv_len == 0 ) {
- rs.sr_err = LDAP_UNWILLING_TO_PERFORM;
- goto cleanup;
- }
+ return pb;
+}
- op->oq_modify.rs_modlist = modlist;
+void
+slapi_add_entry_internal_set_pb( Slapi_PBlock *pb,
+ Slapi_Entry *e,
+ LDAPControl **controls,
+ Slapi_ComponentId *plugin_identity,
+ int operation_flags )
+{
+ slapi_int_connection_init_pb( pb, LDAP_REQ_ADD );
+ slapi_pblock_set( pb, SLAPI_ADD_ENTRY, (void *)e );
+ slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls );
+ slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)&operation_flags );
+ slapi_int_set_operation_dn( pb );
+}
- if ( op->o_bd->be_modify ) {
- int repl_user = be_isupdate( op->o_bd, &op->o_ndn );
- 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 );
+Slapi_PBlock *
+slapi_add_entry_internal(
+ Slapi_Entry *e,
+ LDAPControl **controls,
+ int log_change )
+{
+ Slapi_PBlock *pb;
- rs.sr_err = slap_mods_check( modlist, update,
- &text, textbuf, textlen );
- if ( rs.sr_err != LDAP_SUCCESS ) {
- goto cleanup;
- }
+ pb = slapi_pblock_new();
- if ( !repl_user ) {
- rs.sr_err = slap_mods_opattrs( op, modlist,
- modtail, &text, textbuf,
- textlen );
- if ( rs.sr_err != LDAP_SUCCESS ) {
- goto cleanup;
- }
- }
- if ( (*op->o_bd->be_modify)( op, &rs ) == 0 ) {
- if ( log_change ) {
- replog( op );
- }
- } else {
- rs.sr_err = LDAP_OTHER;
- }
- } else {
- rs.sr_err = LDAP_REFERRAL;
- }
- } else {
- rs.sr_err = LDAP_UNWILLING_TO_PERFORM;
- }
+ slapi_add_entry_internal_set_pb( pb, e, controls, NULL, 0 );
+ slapi_pblock_set( pb, SLAPI_LOG_OPERATION, (void *)&log_change );
+ slapi_add_internal_pb( pb );
-cleanup:
+ return pb;
+}
- if ( pPB != NULL )
- slapi_pblock_set( pPB, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
+void
+slapi_rename_internal_set_pb( Slapi_PBlock *pb,
+ const char *olddn,
+ const char *newrdn,
+ const char *newsuperior,
+ int deloldrdn,
+ LDAPControl **controls,
+ const char *uniqueid,
+ Slapi_ComponentId *plugin_identity,
+ int operation_flags )
+{
+ slapi_int_connection_init_pb( pb, LDAP_REQ_MODRDN );
+ slapi_pblock_set( pb, SLAPI_MODRDN_TARGET, (void *)olddn );
+ slapi_pblock_set( pb, SLAPI_MODRDN_NEWRDN, (void *)newrdn );
+ slapi_pblock_set( pb, SLAPI_MODRDN_NEWSUPERIOR, (void *)newsuperior );
+ slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)&deloldrdn );
+ slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls );
+ slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid );
+ slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)&operation_flags );
+ slapi_int_set_operation_dn( pb );
+}
- if ( dn.bv_val )
- slapi_ch_free( (void **)&dn.bv_val );
+/* Function : slapi_modrdn_internal
+ *
+ * Description : Plugin functions call this routine to modify the rdn
+ * of an entry in the backend directly
+ * Return values : LDAP_SUCCESS
+ * LDAP_PARAM_ERROR
+ * LDAP_NO_MEMORY
+ * LDAP_OTHER
+ * LDAP_UNWILLING_TO_PERFORM
+ *
+ * NOTE: This function does not support the "newSuperior" option from LDAP V3.
+ */
+Slapi_PBlock *
+slapi_modrdn_internal(
+ char *olddn,
+ char *lnewrdn,
+ int deloldrdn,
+ LDAPControl **controls,
+ int log_change )
+{
+ Slapi_PBlock *pb;
- if ( modlist != NULL )
- freeMods( modlist );
+ pb = slapi_pblock_new ();
- if ( pConn != NULL ) {
- pSavePB = pPB;
- }
+ slapi_rename_internal_set_pb( pb, olddn, lnewrdn, NULL,
+ deloldrdn, controls, NULL, NULL, 0 );
+ slapi_pblock_set( pb, SLAPI_LOG_OPERATION, (void *)&log_change );
+ slapi_modrdn_internal_pb( pb );
- slapiConnectionDestroy( &pConn );
+ return pb;
+}
- return ( pSavePB );
-#else
- return NULL;
-#endif /* LDAP_SLAPI */
+void
+slapi_delete_internal_set_pb( Slapi_PBlock *pb,
+ const char *dn,
+ LDAPControl **controls,
+ const char *uniqueid,
+ Slapi_ComponentId *plugin_identity,
+ int operation_flags )
+{
+ slapi_int_connection_init_pb( pb, LDAP_REQ_DELETE );
+ slapi_pblock_set( pb, SLAPI_TARGET_DN, (void *)dn );
+ slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls );
+ slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid );
+ slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity );
+ slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)&operation_flags );
+ slapi_int_set_operation_dn( pb );
}
+/* Function : slapi_delete_internal
+ *
+ * Description : Plugin functions call this routine to delete an entry
+ * in the backend directly
+ * Return values : LDAP_SUCCESS
+ * LDAP_PARAM_ERROR
+ * LDAP_NO_MEMORY
+ * LDAP_OTHER
+ * LDAP_UNWILLING_TO_PERFORM
+*/
Slapi_PBlock *
-slapi_search_internal_bind(
- char *bindDN,
+slapi_delete_internal(
char *ldn,
- int scope,
- char *filStr,
LDAPControl **controls,
- char **attrs,
- int attrsonly )
-{
-#ifdef LDAP_SLAPI
- Connection *c;
- Operation *op = NULL;
- Slapi_PBlock *ptr = NULL;
- Slapi_PBlock *pSavePB = NULL;
- struct berval dn = { 0, NULL };
- Filter *filter=NULL;
- struct berval fstr = { 0, NULL };
- AttributeName *an = NULL;
- const char *text = NULL;
-
- int manageDsaIt = 0;
- int isCritical;
- int i;
-
- SlapReply rs = { REP_RESULT };
-
- c = slapiConnectionInit( 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;
- op->o_ctrls = controls;
-
- dn.bv_val = slapi_ch_strdup(ldn);
- dn.bv_len = strlen(ldn);
-
- rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn );
- if ( rs.sr_err != LDAP_SUCCESS ) {
- goto cleanup;
- }
-
- if ( scope != LDAP_SCOPE_BASE &&
- scope != LDAP_SCOPE_ONELEVEL &&
- scope != LDAP_SCOPE_SUBTREE ) {
- rs.sr_err = LDAP_PROTOCOL_ERROR;
- goto cleanup;
- }
-
- filter = slapi_str2filter(filStr);
- if ( filter == NULL ) {
- rs.sr_err = LDAP_PROTOCOL_ERROR;
- goto cleanup;
- }
-
- filter2bv( filter, &fstr );
-
- for ( i = 0; attrs != NULL && attrs[i] != NULL; i++ ) {
- ; /* count the number of attributes */
- }
-
- if (i > 0) {
- an = (AttributeName *)slapi_ch_calloc( (i + 1), sizeof(AttributeName) );
- for (i = 0; attrs[i] != 0; i++) {
- an[i].an_desc = NULL;
- an[i].an_oc = NULL;
- 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 );
- }
- an[i].an_name.bv_val = NULL;
- }
-
- memset( &rs, 0, sizeof(rs) );
- rs.sr_type = REP_RESULT;
- rs.sr_err = LDAP_SUCCESS;
- rs.sr_entry = NULL; /* paranoia */
-
- if ( scope == LDAP_SCOPE_BASE ) {
- rs.sr_entry = NULL;
-
- if ( op->o_req_ndn.bv_len == 0 ) {
- rs.sr_err = root_dse_info( c, &rs.sr_entry, &rs.sr_text );
- }
-
- if( rs.sr_err != LDAP_SUCCESS ) {
- send_ldap_result( op, &rs );
- goto cleanup;
- } else if ( rs.sr_entry != NULL ) {
- rs.sr_err = test_filter( op, rs.sr_entry, filter );
-
- if ( rs.sr_err == LDAP_COMPARE_TRUE ) {
- rs.sr_type = REP_SEARCH;
- rs.sr_err = LDAP_SUCCESS;
- rs.sr_attrs = an;
-
- send_search_entry( op, &rs );
- }
-
- entry_free( rs.sr_entry );
-
- rs.sr_type = REP_RESULT;
- rs.sr_err = LDAP_SUCCESS;
-
- send_ldap_result( op, &rs );
-
- goto cleanup;
- }
- }
-
- if ( !op->o_req_ndn.bv_len && default_search_nbase.bv_len ) {
- slapi_ch_free( (void **)op->o_req_dn.bv_val );
- slapi_ch_free( (void **)op->o_req_ndn.bv_val );
-
- ber_dupbv( &op->o_req_dn, &default_search_base );
- ber_dupbv( &op->o_req_ndn, &default_search_nbase );
- }
-
- if ( slapi_control_present( controls,
- LDAP_CONTROL_MANAGEDSAIT, NULL, &isCritical ) ) {
- manageDsaIt = 1;
- }
-
- op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 0 );
- if ( op->o_bd == NULL ) {
- if ( manageDsaIt == 1 ) {
- rs.sr_err = LDAP_NO_SUCH_OBJECT;
- } else {
- rs.sr_err = LDAP_PARTIAL_RESULTS;
- }
- goto cleanup;
- }
-
- op->o_dn = c->c_dn = op->o_bd->be_rootdn;
- op->o_ndn = c->c_ndn = op->o_bd->be_rootndn;
-
- 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_attrsonly = attrsonly;
- op->oq_search.rs_attrs = an;
- op->oq_search.rs_filter = filter;
- op->oq_search.rs_filterstr = fstr;
-
- if ( op->o_bd->be_search ) {
- if ( (*op->o_bd->be_search)( op, &rs ) != 0 ) {
- rs.sr_err = LDAP_OTHER;
- }
- } else {
- rs.sr_err = LDAP_UNWILLING_TO_PERFORM;
- }
-
-cleanup:
-
- if ( ptr != NULL )
- slapi_pblock_set( ptr, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
-
- if ( dn.bv_val )
- slapi_ch_free( (void **)&dn.bv_val );
- if ( filter )
- slapi_filter_free( filter, 1 );
- if ( fstr.bv_val )
- slapi_ch_free( (void **)&fstr.bv_val );
- if ( an != NULL )
- slapi_ch_free( (void **)&an );
+ int log_change )
+{
+ Slapi_PBlock *pb;
- if ( c != NULL ) {
- pSavePB = ptr;
- }
+ pb = slapi_pblock_new();
- slapiConnectionDestroy( &c );
+ slapi_delete_internal_set_pb( pb, ldn, controls, NULL, NULL, 0 );
+ slapi_pblock_set( pb, SLAPI_LOG_OPERATION, (void *)&log_change );
+ slapi_delete_internal_pb( pb );
- return( pSavePB );
-#else
- return NULL;
-#endif /* LDAP_SLAPI */
+ return pb;
}
-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 );
-#else
- return NULL;
#endif /* LDAP_SLAPI */
-}
projects / openldap / blobdiff