/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2002-2005 The OpenLDAP Foundation.
+ * Copyright 2002-2012 The OpenLDAP Foundation.
* Portions Copyright 1997,2002-2003 IBM Corporation.
* All rights reserved.
*
/* some parameters require a valid connection and operation */
#define PBLOCK_LOCK_CONN( _pb ) do { \
- ldap_pvt_thread_mutex_lock( &(_pb)->pconn->c_mutex ); \
+ ldap_pvt_thread_mutex_lock( &(_pb)->pb_conn->c_mutex ); \
} while (0)
#define PBLOCK_UNLOCK_CONN( _pb ) do { \
- ldap_pvt_thread_mutex_unlock( &(_pb)->pconn->c_mutex ); \
+ ldap_pvt_thread_mutex_unlock( &(_pb)->pb_conn->c_mutex ); \
} while (0)
/* some parameters are only settable for internal operations */
-#define PBLOCK_VALIDATE_IS_INTOP( _pb ) do { if ( (_pb)->internal_op == 0 ) break; } while ( 0 )
+#define PBLOCK_VALIDATE_IS_INTOP( _pb ) do { if ( (_pb)->pb_intop == 0 ) break; } while ( 0 )
static slapi_pblock_class_t
pblock_get_param_class( int param )
switch ( param ) {
case SLAPI_PLUGIN_TYPE:
case SLAPI_PLUGIN_ARGC:
- case SLAPI_PLUGIN_VERSION:
case SLAPI_PLUGIN_OPRETURN:
case SLAPI_PLUGIN_INTOP_RESULT:
case SLAPI_CONFIG_LINENO:
case SLAPI_DB2LDIF_PRINTKEY:
case SLAPI_LDIF2DB_REMOVEDUPVALS:
case SLAPI_MANAGEDSAIT:
- case SLAPI_REQUESTOR_ISUPDATEDN:
+ case SLAPI_X_RELAX:
+ case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
+ case SLAPI_IS_REPLICATED_OPERATION:
case SLAPI_X_CONN_IS_UDP:
case SLAPI_X_CONN_SSF:
case SLAPI_RESULT_CODE:
+ case SLAPI_LOG_OPERATION:
+ case SLAPI_IS_INTERNAL_OPERATION:
return PBLOCK_CLASS_INTEGER;
break;
case SLAPI_OPERATION_ID:
case SLAPI_OPINITIATED_TIME:
case SLAPI_ABANDON_MSGID:
+ case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
+ case SLAPI_OPERATION_MSGID:
return PBLOCK_CLASS_LONG_INTEGER;
break;
case SLAPI_X_PLUGIN_PRE_GROUP_FN:
case SLAPI_X_PLUGIN_POST_GROUP_FN:
case SLAPI_PLUGIN_AUDIT_FN:
+ case SLAPI_PLUGIN_INTERNAL_PRE_BIND_FN:
+ case SLAPI_PLUGIN_INTERNAL_PRE_UNBIND_FN:
+ case SLAPI_PLUGIN_INTERNAL_PRE_SEARCH_FN:
+ case SLAPI_PLUGIN_INTERNAL_PRE_COMPARE_FN:
+ case SLAPI_PLUGIN_INTERNAL_PRE_ABANDON_FN:
+ case SLAPI_PLUGIN_INTERNAL_POST_BIND_FN:
+ case SLAPI_PLUGIN_INTERNAL_POST_UNBIND_FN:
+ case SLAPI_PLUGIN_INTERNAL_POST_SEARCH_FN:
+ case SLAPI_PLUGIN_INTERNAL_POST_COMPARE_FN:
+ case SLAPI_PLUGIN_INTERNAL_POST_ABANDON_FN:
return PBLOCK_CLASS_FUNCTION_POINTER;
break;
case SLAPI_SEARCH_RESULT_SET:
case SLAPI_SEARCH_RESULT_ENTRY:
case SLAPI_SEARCH_REFERRALS:
- case SLAPI_LOG_OPERATION:
case SLAPI_RESULT_TEXT:
case SLAPI_RESULT_MATCHED:
case SLAPI_X_GROUP_ENTRY:
case SLAPI_X_GROUP_ATTRIBUTE:
case SLAPI_X_GROUP_OPERATION_DN:
case SLAPI_X_GROUP_TARGET_ENTRY:
+ case SLAPI_X_ADD_STRUCTURAL_CLASS:
case SLAPI_PLUGIN_AUDIT_DATA:
case SLAPI_IBM_PBLOCK:
+ case SLAPI_PLUGIN_VERSION:
return PBLOCK_CLASS_POINTER;
break;
default:
static void
pblock_lock( Slapi_PBlock *pb )
{
- ldap_pvt_thread_mutex_lock(&pb->pblockMutex);
+ ldap_pvt_thread_mutex_lock( &pb->pb_mutex );
}
static void
pblock_unlock( Slapi_PBlock *pb )
{
- ldap_pvt_thread_mutex_unlock(&pb->pblockMutex);
+ ldap_pvt_thread_mutex_unlock( &pb->pb_mutex );
}
static int
return PBLOCK_ERROR;
}
- for ( i = 0; i < pb->numParams; i++ ) {
- if ( pb->curParams[i] == param ) {
+ for ( i = 0; i < pb->pb_nParams; i++ ) {
+ if ( pb->pb_params[i] == param ) {
switch ( pbClass ) {
case PBLOCK_CLASS_INTEGER:
- *((int *)value) = (int)pb->curVals[i];
+ *((int *)value) = pb->pb_values[i].pv_integer;
break;
case PBLOCK_CLASS_LONG_INTEGER:
- *((long *)value) = (long)pb->curVals[i];
+ *((long *)value) = pb->pb_values[i].pv_long_integer;
break;
case PBLOCK_CLASS_POINTER:
+ *value = pb->pb_values[i].pv_pointer;
+ break;
case PBLOCK_CLASS_FUNCTION_POINTER:
- *value = pb->curVals[i];
+ *value = pb->pb_values[i].pv_function_pointer;
break;
default:
break;
pblock_set_default( Slapi_PBlock *pb, int param, void *value )
{
slapi_pblock_class_t pbClass;
- size_t i;
+ int i;
pbClass = pblock_get_param_class( param );
if ( pbClass == PBLOCK_CLASS_INVALID ) {
return PBLOCK_ERROR;
}
- if ( pb->numParams == PBLOCK_MAX_PARAMS ) {
+ if ( pb->pb_nParams == PBLOCK_MAX_PARAMS ) {
return PBLOCK_ERROR;
}
- for ( i = 0; i < pb->numParams; i++ ) {
- if ( pb->curParams[i] == param ) {
+ for ( i = 0; i < pb->pb_nParams; i++ ) {
+ if ( pb->pb_params[i] == param )
break;
- }
}
-
- if ( i >= pb->numParams ) {
- pb->curParams[i] = param;
- pb->numParams++;
+ if ( i >= pb->pb_nParams ) {
+ pb->pb_params[i] = param;
+ pb->pb_nParams++;
}
- pb->curVals[i] = value;
+ switch ( pbClass ) {
+ case PBLOCK_CLASS_INTEGER:
+ pb->pb_values[i].pv_integer = (*((int *)value));
+ break;
+ case PBLOCK_CLASS_LONG_INTEGER:
+ pb->pb_values[i].pv_long_integer = (*((long *)value));
+ break;
+ case PBLOCK_CLASS_POINTER:
+ pb->pb_values[i].pv_pointer = value;
+ break;
+ case PBLOCK_CLASS_FUNCTION_POINTER:
+ pb->pb_values[i].pv_function_pointer = value;
+ break;
+ default:
+ break;
+ }
return PBLOCK_SUCCESS;
}
+static int
+pblock_be_call( Slapi_PBlock *pb, int (*bep)(Operation *) )
+{
+ BackendDB *be_orig;
+ Operation *op;
+ int rc;
+
+ PBLOCK_ASSERT_OP( pb, 0 );
+ op = pb->pb_op;
+
+ be_orig = op->o_bd;
+ op->o_bd = select_backend( &op->o_req_ndn, 0 );
+ rc = (*bep)( op );
+ op->o_bd = be_orig;
+
+ return rc;
+}
+
static int
pblock_get( Slapi_PBlock *pb, int param, void **value )
{
switch ( param ) {
case SLAPI_OPERATION:
- *value = pb->pop;
+ *value = pb->pb_op;
break;
case SLAPI_OPINITIATED_TIME:
PBLOCK_ASSERT_OP( pb, 0 );
- *((time_t *)value) = pb->pop->o_time;
+ *((long *)value) = pb->pb_op->o_time;
break;
case SLAPI_OPERATION_ID:
PBLOCK_ASSERT_OP( pb, 0 );
- *((unsigned long *)value) = pb->pop->o_opid;
+ *((long *)value) = pb->pb_op->o_opid;
break;
case SLAPI_OPERATION_TYPE:
PBLOCK_ASSERT_OP( pb, 0 );
- *((ber_tag_t *)value) = pb->pop->o_tag;
+ *((ber_tag_t *)value) = pb->pb_op->o_tag;
+ break;
+ case SLAPI_OPERATION_MSGID:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((long *)value) = pb->pb_op->o_msgid;
+ break;
+ case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((int *)value) = pb->pb_op->o_delete_glue_parent;
+ break;
+ case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((int *)value) = get_no_schema_check( pb->pb_op );
+ break;
+ case SLAPI_X_ADD_STRUCTURAL_CLASS:
+ PBLOCK_ASSERT_OP( pb, 0 );
+
+ if ( pb->pb_op->o_tag == LDAP_REQ_ADD ) {
+ struct berval tmpval = BER_BVNULL;
+
+ rc = mods_structural_class( pb->pb_op->ora_modlist,
+ &tmpval, &pb->pb_rs->sr_text,
+ pb->pb_textbuf, sizeof( pb->pb_textbuf ),
+ pb->pb_op->o_tmpmemctx );
+ *((char **)value) = tmpval.bv_val;
+ } else {
+ rc = PBLOCK_ERROR;
+ }
+ break;
+ case SLAPI_X_OPERATION_NO_SUBORDINATE_GLUE:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((int *)value) = pb->pb_op->o_no_subordinate_glue;
break;
case SLAPI_REQCONTROLS:
PBLOCK_ASSERT_OP( pb, 0 );
- *((LDAPControl ***)value) = pb->pop->o_ctrls;
+ *((LDAPControl ***)value) = pb->pb_op->o_ctrls;
break;
case SLAPI_REQUESTOR_DN:
PBLOCK_ASSERT_OP( pb, 0 );
- *((char **)value) = pb->pop->o_ndn.bv_val;
+ *((char **)value) = pb->pb_op->o_dn.bv_val;
break;
case SLAPI_MANAGEDSAIT:
PBLOCK_ASSERT_OP( pb, 0 );
- *((int *)value) = get_manageDSAit( pb->pop );
+ *((int *)value) = get_manageDSAit( pb->pb_op );
+ break;
+ case SLAPI_X_RELAX:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((int *)value) = get_relax( pb->pb_op );
break;
case SLAPI_BACKEND:
PBLOCK_ASSERT_OP( pb, 0 );
- *((BackendDB **)value) = pb->pop->o_bd;
+ *((BackendDB **)value) = select_backend( &pb->pb_op->o_req_ndn, 0 );
break;
case SLAPI_BE_TYPE:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_bd != NULL )
- *((char **)value) = pb->pop->o_bd->bd_info->bi_type;
+ if ( pb->pb_op->o_bd != NULL )
+ *((char **)value) = pb->pb_op->o_bd->bd_info->bi_type;
else
*value = NULL;
break;
case SLAPI_CONNECTION:
- *value = pb->pconn;
+ *value = pb->pb_conn;
break;
case SLAPI_X_CONN_SSF:
PBLOCK_ASSERT_OP( pb, 0 );
- *((slap_ssf_t *)value) = pb->pconn->c_ssf;
+ *((slap_ssf_t *)value) = pb->pb_conn->c_ssf;
break;
case SLAPI_X_CONN_SASL_CONTEXT:
- PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pconn->c_sasl_authctx != NULL )
- *value = pb->pconn->c_sasl_authctx;
+ PBLOCK_ASSERT_CONN( pb );
+ if ( pb->pb_conn->c_sasl_authctx != NULL )
+ *value = pb->pb_conn->c_sasl_authctx;
else
- *value = pb->pconn->c_sasl_sockctx;
+ *value = pb->pb_conn->c_sasl_sockctx;
break;
case SLAPI_TARGET_DN:
PBLOCK_ASSERT_OP( pb, 0 );
- *((char **)value) = pb->pop->o_req_ndn.bv_val;
+ *((char **)value) = pb->pb_op->o_req_dn.bv_val;
break;
case SLAPI_REQUESTOR_ISROOT:
- PBLOCK_ASSERT_OP( pb, 0 );
- *((int *)value) = be_isroot( pb->pop );
+ *((int *)value) = pblock_be_call( pb, be_isroot );
break;
- case SLAPI_REQUESTOR_ISUPDATEDN:
- PBLOCK_ASSERT_OP( pb, 0 );
- *((int *)value) = be_isupdate( pb->pop );
+ case SLAPI_IS_REPLICATED_OPERATION:
+ *((int *)value) = pblock_be_call( pb, be_slurp_update );
break;
case SLAPI_CONN_AUTHTYPE:
case SLAPI_CONN_AUTHMETHOD: /* XXX should return SASL mech */
- PBLOCK_ASSERT_OP( pb, 0 );
- *((char **)value) = pblock_get_authtype( &pb->pconn->c_authz,
+ PBLOCK_ASSERT_CONN( pb );
+ *((char **)value) = pblock_get_authtype( &pb->pb_conn->c_authz,
#ifdef HAVE_TLS
- pb->pconn->c_is_tls
+ pb->pb_conn->c_is_tls
#else
0
#endif
);
break;
+ case SLAPI_IS_INTERNAL_OPERATION:
+ *((int *)value) = pb->pb_intop;
+ break;
case SLAPI_X_CONN_IS_UDP:
- PBLOCK_ASSERT_OP( pb, 0 );
+ PBLOCK_ASSERT_CONN( pb );
#ifdef LDAP_CONNECTIONLESS
- *((int *)value) = pb->pconn->c_is_udp;
+ *((int *)value) = pb->pb_conn->c_is_udp;
#else
*((int *)value) = 0;
#endif
break;
case SLAPI_CONN_ID:
- PBLOCK_ASSERT_OP( pb, 0 );
- *((unsigned long *)value) = pb->pconn->c_connid;
+ PBLOCK_ASSERT_CONN( pb );
+ *((long *)value) = pb->pb_conn->c_connid;
break;
case SLAPI_CONN_DN:
- PBLOCK_ASSERT_OP( pb, 0 );
- *((char **)value) = pb->pconn->c_dn.bv_val;
+ PBLOCK_ASSERT_CONN( pb );
+#if 0
+ /* This would be necessary to keep plugin compat after the fix in ITS#4158 */
+ if ( pb->pb_op->o_tag == LDAP_REQ_BIND && pb->pb_rs->sr_err == LDAP_SUCCESS )
+ *((char **)value) = pb->pb_op->orb_edn.bv_val;
+ else
+#endif
+ *((char **)value) = pb->pb_conn->c_dn.bv_val;
break;
case SLAPI_CONN_CLIENTIP:
- PBLOCK_ASSERT_OP( pb, 0 );
- if ( strncmp( pb->pconn->c_peer_name.bv_val, "IP=", 3 ) == 0 )
- *((char **)value) = &pb->pconn->c_peer_name.bv_val[3];
+ PBLOCK_ASSERT_CONN( pb );
+ if ( strncmp( pb->pb_conn->c_peer_name.bv_val, "IP=", 3 ) == 0 )
+ *((char **)value) = &pb->pb_conn->c_peer_name.bv_val[3];
else
*value = NULL;
break;
case SLAPI_X_CONN_CLIENTPATH:
- PBLOCK_ASSERT_OP( pb, 0 );
- if ( strncmp( pb->pconn->c_peer_name.bv_val, "PATH=", 3 ) == 0 )
- *((char **)value) = &pb->pconn->c_peer_name.bv_val[5];
+ PBLOCK_ASSERT_CONN( pb );
+ if ( strncmp( pb->pb_conn->c_peer_name.bv_val, "PATH=", 3 ) == 0 )
+ *((char **)value) = &pb->pb_conn->c_peer_name.bv_val[5];
else
*value = NULL;
break;
case SLAPI_CONN_SERVERIP:
- PBLOCK_ASSERT_OP( pb, 0 );
- if ( strncmp( pb->pconn->c_peer_name.bv_val, "IP=", 3 ) == 0 )
- *((char **)value) = &pb->pconn->c_sock_name.bv_val[3];
+ PBLOCK_ASSERT_CONN( pb );
+ if ( strncmp( pb->pb_conn->c_sock_name.bv_val, "IP=", 3 ) == 0 )
+ *((char **)value) = &pb->pb_conn->c_sock_name.bv_val[3];
else
*value = NULL;
break;
case SLAPI_X_CONN_SERVERPATH:
- PBLOCK_ASSERT_OP( pb, 0 );
- if ( strncmp( pb->pconn->c_peer_name.bv_val, "PATH=", 3 ) == 0 )
- *((char **)value) = &pb->pconn->c_sock_name.bv_val[5];
+ PBLOCK_ASSERT_CONN( pb );
+ if ( strncmp( pb->pb_conn->c_sock_name.bv_val, "PATH=", 3 ) == 0 )
+ *((char **)value) = &pb->pb_conn->c_sock_name.bv_val[5];
else
*value = NULL;
break;
case SLAPI_RESULT_CODE:
case SLAPI_PLUGIN_INTOP_RESULT:
- *((int *)value) = pb->rs.sr_err;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((int *)value) = pb->pb_rs->sr_err;
break;
case SLAPI_RESULT_TEXT:
- *((const char **)value) = pb->rs.sr_text;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((const char **)value) = pb->pb_rs->sr_text;
break;
case SLAPI_RESULT_MATCHED:
- *((const char **)value) = pb->rs.sr_matched;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((const char **)value) = pb->pb_rs->sr_matched;
break;
case SLAPI_ADD_ENTRY:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_ADD )
- *((Slapi_Entry **)value) = pb->pop->ora_e;
+ if ( pb->pb_op->o_tag == LDAP_REQ_ADD )
+ *((Slapi_Entry **)value) = pb->pb_op->ora_e;
else
*value = NULL;
break;
case SLAPI_MODIFY_MODS: {
LDAPMod **mods = NULL;
+ Modifications *ml = NULL;
pblock_get_default( pb, param, (void **)&mods );
- if ( mods == NULL && pb->internal_op == 0 ) {
- if ( pb->pop->o_tag != LDAP_REQ_MODIFY ) {
+ if ( mods == NULL && pb->pb_intop == 0 ) {
+ switch ( pb->pb_op->o_tag ) {
+ case LDAP_REQ_MODIFY:
+ ml = pb->pb_op->orm_modlist;
+ break;
+ case LDAP_REQ_MODRDN:
+ ml = pb->pb_op->orr_modlist;
+ break;
+ default:
rc = PBLOCK_ERROR;
break;
}
- mods = slapi_int_modifications2ldapmods( &pb->pop->orm_modlist, NULL );
- pblock_set_default( pb, param, (void *)mods );
+ if ( rc != PBLOCK_ERROR ) {
+ mods = slapi_int_modifications2ldapmods( ml );
+ pblock_set_default( pb, param, (void *)mods );
+ }
}
*((LDAPMod ***)value) = mods;
break;
}
case SLAPI_MODRDN_NEWRDN:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_MODRDN )
- *((char **)value) = pb->pop->orr_newrdn.bv_val;
+ if ( pb->pb_op->o_tag == LDAP_REQ_MODRDN )
+ *((char **)value) = pb->pb_op->orr_newrdn.bv_val;
else
*value = NULL;
break;
case SLAPI_MODRDN_NEWSUPERIOR:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_MODRDN && pb->pop->orr_newSup != NULL )
- *((char **)value) = pb->pop->orr_newSup->bv_val;
+ if ( pb->pb_op->o_tag == LDAP_REQ_MODRDN && pb->pb_op->orr_newSup != NULL )
+ *((char **)value) = pb->pb_op->orr_newSup->bv_val;
else
*value = NULL;
break;
case SLAPI_MODRDN_DELOLDRDN:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_MODRDN )
- *((int *)value) = pb->pop->orr_deleteoldrdn;
+ if ( pb->pb_op->o_tag == LDAP_REQ_MODRDN )
+ *((int *)value) = pb->pb_op->orr_deleteoldrdn;
else
*((int *)value) = 0;
break;
case SLAPI_SEARCH_SCOPE:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- *((int *)value) = pb->pop->ors_scope;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ *((int *)value) = pb->pb_op->ors_scope;
else
*((int *)value) = 0;
break;
case SLAPI_SEARCH_DEREF:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- *((int *)value) = pb->pop->ors_deref;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ *((int *)value) = pb->pb_op->ors_deref;
else
*((int *)value) = 0;
break;
case SLAPI_SEARCH_SIZELIMIT:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- *((int *)value) = pb->pop->ors_slimit;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ *((int *)value) = pb->pb_op->ors_slimit;
else
*((int *)value) = 0;
break;
case SLAPI_SEARCH_TIMELIMIT:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- *((int *)value) = pb->pop->ors_tlimit;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ *((int *)value) = pb->pb_op->ors_tlimit;
else
*((int *)value) = 0;
break;
case SLAPI_SEARCH_FILTER:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- *((Slapi_Filter **)value) = pb->pop->ors_filter;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ *((Slapi_Filter **)value) = pb->pb_op->ors_filter;
else
*((Slapi_Filter **)value) = NULL;
break;
case SLAPI_SEARCH_STRFILTER:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- *((char **)value) = pb->pop->ors_filterstr.bv_val;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ *((char **)value) = pb->pb_op->ors_filterstr.bv_val;
else
*((char **)value) = NULL;
break;
char **attrs = NULL;
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag != LDAP_REQ_SEARCH ) {
+ if ( pb->pb_op->o_tag != LDAP_REQ_SEARCH ) {
rc = PBLOCK_ERROR;
break;
}
pblock_get_default( pb, param, (void **)&attrs );
- if ( attrs == NULL && pb->internal_op == 0 ) {
- attrs = anlist2charray_x( pb->pop->ors_attrs, 0, pb->pop->o_tmpmemctx );
+ if ( attrs == NULL && pb->pb_intop == 0 ) {
+ attrs = anlist2charray_x( pb->pb_op->ors_attrs, 0, pb->pb_op->o_tmpmemctx );
pblock_set_default( pb, param, (void *)attrs );
}
- *((char ***)attrs) = attrs;
+ *((char ***)value) = attrs;
+ break;
}
case SLAPI_SEARCH_ATTRSONLY:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- *((int *)value) = pb->pop->ors_attrsonly;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ *((int *)value) = pb->pb_op->ors_attrsonly;
else
*((int *)value) = 0;
break;
case SLAPI_SEARCH_RESULT_ENTRY:
- *((Slapi_Entry **)value) = pb->rs.sr_entry;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((Slapi_Entry **)value) = pb->pb_rs->sr_entry;
break;
case SLAPI_BIND_RET_SASLCREDS:
- *((struct berval **)value) = pb->rs.sr_sasldata;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((struct berval **)value) = pb->pb_rs->sr_sasldata;
break;
case SLAPI_EXT_OP_REQ_OID:
- *((const char **)value) = pb->pop->ore_reqoid.bv_val;
+ *((const char **)value) = pb->pb_op->ore_reqoid.bv_val;
break;
case SLAPI_EXT_OP_REQ_VALUE:
- *((struct berval **)value) = pb->pop->ore_reqdata;
+ *((struct berval **)value) = pb->pb_op->ore_reqdata;
break;
case SLAPI_EXT_OP_RET_OID:
- *((const char **)value) = pb->rs.sr_rspoid;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((const char **)value) = pb->pb_rs->sr_rspoid;
break;
case SLAPI_EXT_OP_RET_VALUE:
- *((struct berval **)value) = pb->rs.sr_rspdata;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ *((struct berval **)value) = pb->pb_rs->sr_rspdata;
break;
case SLAPI_BIND_METHOD:
- if ( pb->pop->o_tag == LDAP_REQ_BIND )
- *((int *)value) = pb->pop->orb_method;
+ if ( pb->pb_op->o_tag == LDAP_REQ_BIND )
+ *((int *)value) = pb->pb_op->orb_method;
else
*((int *)value) = 0;
break;
case SLAPI_BIND_CREDENTIALS:
- if ( pb->pop->o_tag == LDAP_REQ_BIND )
- *((struct berval **)value) = &pb->pop->orb_cred;
+ if ( pb->pb_op->o_tag == LDAP_REQ_BIND )
+ *((struct berval **)value) = &pb->pb_op->orb_cred;
else
*value = NULL;
break;
case SLAPI_COMPARE_TYPE:
- if ( pb->pop->o_tag == LDAP_REQ_COMPARE )
- *((char **)value) = pb->pop->orc_ava->aa_desc->ad_cname.bv_val;
+ if ( pb->pb_op->o_tag == LDAP_REQ_COMPARE )
+ *((char **)value) = pb->pb_op->orc_ava->aa_desc->ad_cname.bv_val;
else
*value = NULL;
break;
case SLAPI_COMPARE_VALUE:
- if ( pb->pop->o_tag == LDAP_REQ_COMPARE )
- *((struct berval **)value) = &pb->pop->orc_ava->aa_value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_COMPARE )
+ *((struct berval **)value) = &pb->pb_op->orc_ava->aa_value;
else
*value = NULL;
break;
+ case SLAPI_ABANDON_MSGID:
+ if ( pb->pb_op->o_tag == LDAP_REQ_ABANDON )
+ *((int *)value) = pb->pb_op->orn_msgid;
+ else
+ *((int *)value) = 0;
+ break;
default:
rc = pblock_get_default( pb, param, value );
break;
controls = (LDAPControl **)slapi_ch_realloc( (char *)controls,
( i + 2 ) * sizeof(LDAPControl *));
- controls[i] = control;
+ controls[i++] = slapi_dup_control( control );
+ controls[i] = NULL;
return pblock_set_default( pb, SLAPI_RESCONTROLS, (void *)controls );
}
}
bv.bv_val = (char *)value;
- bv.bv_len = strlen( bv.bv_val );
+ bv.bv_len = ( value != NULL ) ? strlen( bv.bv_val ) : 0;
return dnPrettyNormal( NULL, &bv, dn, ndn, memctx );
}
switch ( param ) {
case SLAPI_OPERATION:
- pb->pop = (Operation *)value;
+ pb->pb_op = (Operation *)value;
break;
case SLAPI_OPINITIATED_TIME:
PBLOCK_ASSERT_OP( pb, 0 );
- pb->pop->o_time = (time_t)value;
+ pb->pb_op->o_time = *((long *)value);
break;
case SLAPI_OPERATION_ID:
PBLOCK_ASSERT_OP( pb, 0 );
- pb->pop->o_opid = (unsigned long)value;
+ pb->pb_op->o_opid = *((long *)value);
break;
case SLAPI_OPERATION_TYPE:
PBLOCK_ASSERT_OP( pb, 0 );
- pb->pop->o_tag = (ber_tag_t)value;
+ pb->pb_op->o_tag = *((ber_tag_t *)value);
+ break;
+ case SLAPI_OPERATION_MSGID:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_op->o_msgid = *((long *)value);
+ break;
+ case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_op->o_delete_glue_parent = *((int *)value);
+ break;
+ case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_op->o_no_schema_check = *((int *)value);
+ break;
+ case SLAPI_X_OPERATION_NO_SUBORDINATE_GLUE:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_op->o_no_subordinate_glue = *((int *)value);
break;
case SLAPI_REQCONTROLS:
PBLOCK_ASSERT_OP( pb, 0 );
- pb->pop->o_ctrls = (LDAPControl **)value;
+ pb->pb_op->o_ctrls = (LDAPControl **)value;
break;
case SLAPI_RESCONTROLS: {
LDAPControl **ctrls = NULL;
pblock_get_default( pb, param, (void **)&ctrls );
- if ( ctrls == NULL ) {
+ if ( ctrls != NULL ) {
/* free old ones first */
ldap_controls_free( ctrls );
}
break;
case SLAPI_REQUESTOR_DN:
PBLOCK_ASSERT_OP( pb, 0 );
- rc = pblock_set_dn( value, &pb->pop->o_dn, &pb->pop->o_ndn, pb->pop->o_tmpmemctx );
+ rc = pblock_set_dn( value, &pb->pb_op->o_dn, &pb->pb_op->o_ndn, pb->pb_op->o_tmpmemctx );
break;
case SLAPI_MANAGEDSAIT:
PBLOCK_ASSERT_OP( pb, 0 );
- pb->pop->o_managedsait = (int)value;
+ pb->pb_op->o_managedsait = *((int *)value);
+ break;
+ case SLAPI_X_RELAX:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_op->o_relax = *((int *)value);
break;
case SLAPI_BACKEND:
PBLOCK_ASSERT_OP( pb, 0 );
- pb->pop->o_bd = (BackendDB *)value;
+ pb->pb_op->o_bd = (BackendDB *)value;
break;
case SLAPI_CONNECTION:
- pb->pconn = (Connection *)value;
+ pb->pb_conn = (Connection *)value;
break;
case SLAPI_X_CONN_SSF:
- PBLOCK_ASSERT_OP( pb, 0 );
+ PBLOCK_ASSERT_CONN( pb );
PBLOCK_LOCK_CONN( pb );
- pb->pconn->c_ssf = (slap_ssf_t)value;
+ pb->pb_conn->c_ssf = (slap_ssf_t)(long)value;
PBLOCK_UNLOCK_CONN( pb );
break;
case SLAPI_X_CONN_SASL_CONTEXT:
- PBLOCK_ASSERT_OP( pb, 0 );
+ PBLOCK_ASSERT_CONN( pb );
PBLOCK_LOCK_CONN( pb );
- pb->pconn->c_sasl_authctx = value;
+ pb->pb_conn->c_sasl_authctx = value;
PBLOCK_UNLOCK_CONN( pb );
break;
case SLAPI_TARGET_DN:
PBLOCK_ASSERT_OP( pb, 0 );
- rc = pblock_set_dn( value, &pb->pop->o_req_dn, &pb->pop->o_req_ndn, pb->pop->o_tmpmemctx );
+ rc = pblock_set_dn( value, &pb->pb_op->o_req_dn, &pb->pb_op->o_req_ndn, pb->pb_op->o_tmpmemctx );
break;
case SLAPI_CONN_ID:
- PBLOCK_ASSERT_OP( pb, 0 );
+ PBLOCK_ASSERT_CONN( pb );
PBLOCK_LOCK_CONN( pb );
- pb->pconn->c_connid = (unsigned long)value;
+ pb->pb_conn->c_connid = *((long *)value);
PBLOCK_UNLOCK_CONN( pb );
break;
case SLAPI_CONN_DN:
- PBLOCK_ASSERT_OP( pb, 0 );
+ PBLOCK_ASSERT_CONN( pb );
PBLOCK_LOCK_CONN( pb );
- rc = pblock_set_dn( value, &pb->pconn->c_dn, &pb->pconn->c_ndn, NULL );
+ rc = pblock_set_dn( value, &pb->pb_conn->c_dn, &pb->pb_conn->c_ndn, NULL );
PBLOCK_UNLOCK_CONN( pb );
break;
case SLAPI_RESULT_CODE:
case SLAPI_PLUGIN_INTOP_RESULT:
- pb->rs.sr_err = (int)value;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_rs->sr_err = *((int *)value);
break;
case SLAPI_RESULT_TEXT:
- snprintf( pb->textbuf, sizeof( pb->textbuf ), "%s", (char *)value );
- pb->rs.sr_text = pb->textbuf;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ snprintf( pb->pb_textbuf, sizeof( pb->pb_textbuf ), "%s", (char *)value );
+ pb->pb_rs->sr_text = pb->pb_textbuf;
break;
case SLAPI_RESULT_MATCHED:
- pb->rs.sr_matched = (char *)value; /* XXX should dup? */
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_rs->sr_matched = (char *)value; /* XXX should dup? */
break;
case SLAPI_ADD_ENTRY:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_ADD ) {
- pb->pop->ora_e = (Slapi_Entry *)value;
- } else {
+ if ( pb->pb_op->o_tag == LDAP_REQ_ADD )
+ pb->pb_op->ora_e = (Slapi_Entry *)value;
+ else
rc = PBLOCK_ERROR;
- }
break;
case SLAPI_MODIFY_MODS: {
Modifications **mlp;
+ Modifications *newmods;
PBLOCK_ASSERT_OP( pb, 0 );
rc = pblock_set_default( pb, param, value );
break;
}
- if ( pb->pop->o_tag == LDAP_REQ_MODIFY ) {
- mlp = &pb->pop->orm_modlist;
- } else if ( pb->pop->o_tag == LDAP_REQ_ADD ) {
- mlp = &pb->pop->ora_modlist;
+ if ( pb->pb_op->o_tag == LDAP_REQ_MODIFY ) {
+ mlp = &pb->pb_op->orm_modlist;
+ } else if ( pb->pb_op->o_tag == LDAP_REQ_ADD ) {
+ mlp = &pb->pb_op->ora_modlist;
+ } else if ( pb->pb_op->o_tag == LDAP_REQ_MODRDN ) {
+ mlp = &pb->pb_op->orr_modlist;
} else {
break;
}
- if ( *mlp != NULL ) {
- if ( pb->internal_op )
- slapi_int_mods_free( *mlp ); /* caller owns values */
- else
- slap_mods_free( *mlp ); /* we own values */
- *mlp = NULL;
+ newmods = slapi_int_ldapmods2modifications( pb->pb_op, (LDAPMod **)value );
+ if ( newmods != NULL ) {
+ slap_mods_free( *mlp, 1 );
+ *mlp = newmods;
}
- *mlp = slapi_int_ldapmods2modifications( (LDAPMod **)value, NULL );
break;
}
case SLAPI_MODRDN_NEWRDN:
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_MODRDN ) {
- rc = pblock_set_dn( value, &pb->pop->orr_newrdn, &pb->pop->orr_nnewrdn, pb->pop->o_tmpmemctx );
- if ( rc == LDAP_SUCCESS ) rc = rdn_validate( &pb->pop->orr_nnewrdn );
+ if ( pb->pb_op->o_tag == LDAP_REQ_MODRDN ) {
+ rc = pblock_set_dn( value, &pb->pb_op->orr_newrdn, &pb->pb_op->orr_nnewrdn, pb->pb_op->o_tmpmemctx );
+ if ( rc == LDAP_SUCCESS )
+ rc = rdn_validate( &pb->pb_op->orr_nnewrdn );
} else {
rc = PBLOCK_ERROR;
}
case SLAPI_MODRDN_NEWSUPERIOR:
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_MODRDN ) {
+ if ( pb->pb_op->o_tag == LDAP_REQ_MODRDN ) {
if ( value == NULL ) {
- if ( pb->pop->orr_newSup != NULL ) {
- pb->pop->o_tmpfree( pb->pop->orr_newSup, pb->pop->o_tmpmemctx );
- pb->pop->orr_newSup = NULL;
+ if ( pb->pb_op->orr_newSup != NULL ) {
+ pb->pb_op->o_tmpfree( pb->pb_op->orr_newSup, pb->pb_op->o_tmpmemctx );
+ BER_BVZERO( pb->pb_op->orr_newSup );
+ pb->pb_op->orr_newSup = NULL;
}
- if ( pb->pop->orr_newSup != NULL ) {
- pb->pop->o_tmpfree( pb->pop->orr_nnewSup, pb->pop->o_tmpmemctx );
- pb->pop->orr_nnewSup = NULL;
+ if ( pb->pb_op->orr_newSup != NULL ) {
+ pb->pb_op->o_tmpfree( pb->pb_op->orr_nnewSup, pb->pb_op->o_tmpmemctx );
+ BER_BVZERO( pb->pb_op->orr_nnewSup );
+ pb->pb_op->orr_nnewSup = NULL;
}
} else {
- if ( pb->pop->orr_newSup == NULL ) {
- pb->pop->orr_newSup = (struct berval *)pb->pop->o_tmpalloc(
- sizeof(struct berval), pb->pop->o_tmpmemctx );
+ if ( pb->pb_op->orr_newSup == NULL ) {
+ pb->pb_op->orr_newSup = (struct berval *)pb->pb_op->o_tmpalloc(
+ sizeof(struct berval), pb->pb_op->o_tmpmemctx );
+ BER_BVZERO( pb->pb_op->orr_newSup );
}
- if ( pb->pop->orr_nnewSup == NULL ) {
- pb->pop->orr_nnewSup = (struct berval *)pb->pop->o_tmpalloc(
- sizeof(struct berval), pb->pop->o_tmpmemctx );
+ if ( pb->pb_op->orr_nnewSup == NULL ) {
+ pb->pb_op->orr_nnewSup = (struct berval *)pb->pb_op->o_tmpalloc(
+ sizeof(struct berval), pb->pb_op->o_tmpmemctx );
+ BER_BVZERO( pb->pb_op->orr_nnewSup );
}
- rc = pblock_set_dn( value, pb->pop->orr_newSup, pb->pop->orr_nnewSup, pb->pop->o_tmpmemctx );
+ rc = pblock_set_dn( value, pb->pb_op->orr_newSup, pb->pb_op->orr_nnewSup, pb->pb_op->o_tmpmemctx );
}
} else {
rc = PBLOCK_ERROR;
case SLAPI_MODRDN_DELOLDRDN:
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_MODRDN )
- pb->pop->orr_deleteoldrdn = (int)value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_MODRDN )
+ pb->pb_op->orr_deleteoldrdn = *((int *)value);
else
rc = PBLOCK_ERROR;
break;
- case SLAPI_SEARCH_SCOPE:
+ case SLAPI_SEARCH_SCOPE: {
+ int scope = *((int *)value);
+
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH ) {
- switch ( (int)value ) {
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH ) {
+ switch ( *((int *)value) ) {
case LDAP_SCOPE_BASE:
case LDAP_SCOPE_ONELEVEL:
case LDAP_SCOPE_SUBTREE:
-#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE:
-#endif
- pb->pop->ors_scope = (int)value;
+ pb->pb_op->ors_scope = scope;
break;
default:
rc = PBLOCK_ERROR;
rc = PBLOCK_ERROR;
}
break;
+ }
case SLAPI_SEARCH_DEREF:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- pb->pop->ors_deref = (int)value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ pb->pb_op->ors_deref = *((int *)value);
else
rc = PBLOCK_ERROR;
break;
case SLAPI_SEARCH_SIZELIMIT:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- pb->pop->ors_slimit = (int)value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ pb->pb_op->ors_slimit = *((int *)value);
else
rc = PBLOCK_ERROR;
break;
case SLAPI_SEARCH_TIMELIMIT:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- pb->pop->ors_tlimit = (int)value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ pb->pb_op->ors_tlimit = *((int *)value);
else
rc = PBLOCK_ERROR;
break;
case SLAPI_SEARCH_FILTER:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH ) {
- pb->pop->ors_filter = (Slapi_Filter *)value;
- } else {
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ pb->pb_op->ors_filter = (Slapi_Filter *)value;
+ else
rc = PBLOCK_ERROR;
- }
break;
case SLAPI_SEARCH_STRFILTER:
PBLOCK_ASSERT_OP( pb, 0 );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH ) {
- pb->pop->ors_filterstr.bv_val = (char *)value;
- pb->pop->ors_filterstr.bv_len = strlen((char *)value);
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH ) {
+ pb->pb_op->ors_filterstr.bv_val = (char *)value;
+ pb->pb_op->ors_filterstr.bv_len = strlen((char *)value);
} else {
rc = PBLOCK_ERROR;
}
break;
case SLAPI_SEARCH_ATTRS: {
AttributeName *an = NULL;
- size_t i = 0;
+ size_t i = 0, j = 0;
char **attrs = (char **)value;
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag != LDAP_REQ_SEARCH ) {
+ if ( pb->pb_op->o_tag != LDAP_REQ_SEARCH ) {
rc = PBLOCK_ERROR;
break;
}
if ( rc != PBLOCK_SUCCESS ) {
break;
}
- if ( pb->pop->ors_attrs != NULL ) {
- pb->pop->o_tmpfree( pb->pop->ors_attrs, pb->pop->o_tmpmemctx );
- pb->pop->ors_attrs = NULL;
+ if ( pb->pb_op->ors_attrs != NULL ) {
+ pb->pb_op->o_tmpfree( pb->pb_op->ors_attrs, pb->pb_op->o_tmpmemctx );
+ pb->pb_op->ors_attrs = NULL;
}
if ( attrs != NULL ) {
for ( i = 0; attrs[i] != NULL; i++ )
;
}
if ( i ) {
- an = (AttributeName *)pb->pop->o_tmpalloc( (i + 1) *
- sizeof(AttributeName), pb->pop->o_tmpmemctx );
+ an = (AttributeName *)pb->pb_op->o_tmpcalloc( i + 1,
+ sizeof(AttributeName), pb->pb_op->o_tmpmemctx );
for ( i = 0; attrs[i] != NULL; i++ ) {
- an[i].an_desc = NULL;
- an[i].an_oc = NULL;
- an[i].an_oc_exclude = 0;
- an[i].an_name.bv_val = attrs[i];
- an[i].an_name.bv_len = strlen( attrs[i] );
- slap_bv2ad( &an[i].an_name, &an[i].an_desc, &pb->rs.sr_text );
+ an[j].an_desc = NULL;
+ an[j].an_oc = NULL;
+ an[j].an_flags = 0;
+ an[j].an_name.bv_val = attrs[i];
+ an[j].an_name.bv_len = strlen( attrs[i] );
+ if ( slap_bv2ad( &an[j].an_name, &an[j].an_desc, &pb->pb_rs->sr_text ) == LDAP_SUCCESS ) {
+ j++;
+ }
}
- an[i].an_name.bv_val = NULL;
- an[i].an_name.bv_len = 0;
+ an[j].an_name.bv_val = NULL;
+ an[j].an_name.bv_len = 0;
}
- pb->pop->ors_attrs = an;
+ pb->pb_op->ors_attrs = an;
break;
}
case SLAPI_SEARCH_ATTRSONLY:
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_SEARCH )
- pb->pop->ors_attrsonly = (int)value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_SEARCH )
+ pb->pb_op->ors_attrsonly = *((int *)value);
else
rc = PBLOCK_ERROR;
break;
case SLAPI_SEARCH_RESULT_ENTRY:
PBLOCK_ASSERT_OP( pb, 0 );
- pb->rs.sr_entry = (Slapi_Entry *)value;
+ rs_replace_entry( pb->pb_op, pb->pb_rs, NULL, (Slapi_Entry *)value );
+ /* TODO: Should REP_ENTRY_MODIFIABLE be set? */
+ pb->pb_rs->sr_flags |= REP_ENTRY_MUSTBEFREED;
break;
case SLAPI_BIND_RET_SASLCREDS:
- pb->rs.sr_sasldata = (struct berval *)value;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_rs->sr_sasldata = (struct berval *)value;
break;
case SLAPI_EXT_OP_REQ_OID:
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_EXTENDED ) {
- pb->pop->ore_reqoid.bv_val = (char *)value;
- pb->pop->ore_reqoid.bv_len = strlen((char *)value);
+ if ( pb->pb_op->o_tag == LDAP_REQ_EXTENDED ) {
+ pb->pb_op->ore_reqoid.bv_val = (char *)value;
+ pb->pb_op->ore_reqoid.bv_len = strlen((char *)value);
} else {
rc = PBLOCK_ERROR;
}
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_EXTENDED )
- pb->pop->ore_reqdata = (struct berval *)value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_EXTENDED )
+ pb->pb_op->ore_reqdata = (struct berval *)value;
else
rc = PBLOCK_ERROR;
break;
case SLAPI_EXT_OP_RET_OID:
- pb->rs.sr_rspoid = (char *)value;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_rs->sr_rspoid = (char *)value;
break;
case SLAPI_EXT_OP_RET_VALUE:
- pb->rs.sr_rspdata = (struct berval *)value;
+ PBLOCK_ASSERT_OP( pb, 0 );
+ pb->pb_rs->sr_rspdata = (struct berval *)value;
break;
case SLAPI_BIND_METHOD:
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_BIND )
- pb->pop->orb_method = (int)value;
+ if ( pb->pb_op->o_tag == LDAP_REQ_BIND )
+ pb->pb_op->orb_method = *((int *)value);
else
rc = PBLOCK_ERROR;
break;
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_BIND )
- pb->pop->orb_cred = *((struct berval *)value);
+ if ( pb->pb_op->o_tag == LDAP_REQ_BIND )
+ pb->pb_op->orb_cred = *((struct berval *)value);
else
rc = PBLOCK_ERROR;
break;
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_COMPARE ) {
+ if ( pb->pb_op->o_tag == LDAP_REQ_COMPARE ) {
const char *text;
- pb->pop->orc_ava->aa_desc = NULL;
- rc = slap_str2ad( (char *)value, &pb->pop->orc_ava->aa_desc, &text );
+ pb->pb_op->orc_ava->aa_desc = NULL;
+ rc = slap_str2ad( (char *)value, &pb->pb_op->orc_ava->aa_desc, &text );
} else {
rc = PBLOCK_ERROR;
}
PBLOCK_ASSERT_OP( pb, 0 );
PBLOCK_VALIDATE_IS_INTOP( pb );
- if ( pb->pop->o_tag == LDAP_REQ_COMPARE ) {
- pb->pop->orc_ava->aa_value = *((struct berval *)value);
- } else {
+ if ( pb->pb_op->o_tag == LDAP_REQ_COMPARE )
+ pb->pb_op->orc_ava->aa_value = *((struct berval *)value);
+ else
+ rc = PBLOCK_ERROR;
+ break;
+ case SLAPI_ABANDON_MSGID:
+ PBLOCK_ASSERT_OP( pb, 0 );
+ PBLOCK_VALIDATE_IS_INTOP( pb );
+
+ if ( pb->pb_op->o_tag == LDAP_REQ_ABANDON)
+ pb->pb_op->orn_msgid = *((int *)value);
+ else
rc = PBLOCK_ERROR;
- }
break;
case SLAPI_REQUESTOR_ISROOT:
- case SLAPI_REQUESTOR_ISUPDATEDN:
+ case SLAPI_IS_REPLICATED_OPERATION:
case SLAPI_CONN_AUTHTYPE:
case SLAPI_CONN_AUTHMETHOD:
+ case SLAPI_IS_INTERNAL_OPERATION:
case SLAPI_X_CONN_IS_UDP:
case SLAPI_CONN_CLIENTIP:
case SLAPI_X_CONN_CLIENTPATH:
case SLAPI_CONN_SERVERIP:
case SLAPI_X_CONN_SERVERPATH:
+ case SLAPI_X_ADD_STRUCTURAL_CLASS:
+ /* These parameters cannot be set */
rc = PBLOCK_ERROR;
break;
default:
static void
pblock_clear( Slapi_PBlock *pb )
{
- pb->numParams = 1;
+ pb->pb_nParams = 1;
}
static int
pblock_lock(p);
- for ( i = 0; i < p->numParams; i++ ) {
- if ( p->curParams[i] == param ) {
+ for ( i = 0; i < p->pb_nParams; i++ ) {
+ if ( p->pb_params[i] == param ) {
break;
}
}
- if (i >= p->numParams ) {
+ if (i >= p->pb_nParams ) {
pblock_unlock( p );
return PBLOCK_ERROR;
}
/* move last parameter to index of deleted parameter */
- if ( p->numParams > 1 ) {
- p->curParams[i] = p->curParams[p->numParams - 1];
- p->curVals[i] = p->curVals[p->numParams - 1];
+ if ( p->pb_nParams > 1 ) {
+ p->pb_params[i] = p->pb_params[p->pb_nParams - 1];
+ p->pb_values[i] = p->pb_values[p->pb_nParams - 1];
}
- p->numParams--;
+ p->pb_nParams--;
pblock_unlock( p );
pb = (Slapi_PBlock *) ch_calloc( 1, sizeof(Slapi_PBlock) );
if ( pb != NULL ) {
- ldap_pvt_thread_mutex_init( &pb->pblockMutex );
- memset( pb->curParams, 0, sizeof(pb->curParams) );
- memset( pb->curVals, 0, sizeof(pb->curVals) );
- pb->curParams[0] = SLAPI_IBM_PBLOCK;
- pb->curVals[0] = NULL;
- pb->numParams = 1;
- pb->pconn = NULL;
- pb->pop = NULL;
- pb->internal_op = 0;
+ ldap_pvt_thread_mutex_init( &pb->pb_mutex );
+
+ pb->pb_params[0] = SLAPI_IBM_PBLOCK;
+ pb->pb_values[0].pv_pointer = NULL;
+ pb->pb_nParams = 1;
+ pb->pb_conn = NULL;
+ pb->pb_op = NULL;
+ pb->pb_rs = NULL;
+ pb->pb_intop = 0;
}
return pb;
}
-void
-slapi_pblock_destroy( Slapi_PBlock* pb )
+static void
+pblock_destroy( Slapi_PBlock *pb )
{
LDAPControl **controls = NULL;
+ LDAPMod **mods = NULL;
+ char **attrs = NULL;
assert( pb != NULL );
- if ( pb->internal_op ) {
+ pblock_get_default( pb, SLAPI_RESCONTROLS, (void **)&controls );
+ if ( controls != NULL ) {
+ ldap_controls_free( controls );
+ }
+
+ if ( pb->pb_intop ) {
slapi_int_connection_done_pb( pb );
} else {
- LDAPMod **mods = NULL;
- char **attrs = NULL;
-
pblock_get_default( pb, SLAPI_MODIFY_MODS, (void **)&mods );
-
- if ( mods != NULL )
- slapi_int_free_ldapmods( mods );
+ ldap_mods_free( mods, 1 );
pblock_get_default( pb, SLAPI_SEARCH_ATTRS, (void **)&attrs );
-
if ( attrs != NULL )
- pb->pop->o_tmpfree( attrs, pb->pop->o_tmpmemctx );
- }
-
- pblock_get_default( pb, SLAPI_RESCONTROLS, (void **)&controls );
- if ( controls != NULL ) {
- ldap_controls_free( controls );
+ pb->pb_op->o_tmpfree( attrs, pb->pb_op->o_tmpmemctx );
}
- ldap_pvt_thread_mutex_destroy( &pb->pblockMutex );
-
+ ldap_pvt_thread_mutex_destroy( &pb->pb_mutex );
slapi_ch_free( (void **)&pb );
}
+void
+slapi_pblock_destroy( Slapi_PBlock *pb )
+{
+ if ( pb != NULL ) {
+ pblock_destroy( pb );
+ }
+}
+
int
slapi_pblock_get( Slapi_PBlock *pb, int arg, void *value )
{
}
#endif /* LDAP_SLAPI */
-
projects / openldap / blobdiff