/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
*/
#include "portable.h"
-#include "slapi_common.h"
#include <stdio.h>
#include <ac/string.h>
#include "ldap_pvt.h"
#include "slap.h"
+
+#ifdef LDAP_SLAPI
#include "slapi.h"
+static Slapi_PBlock *initAddPlugin( Backend *be, Connection *conn, Operation *op,
+ struct berval *dn, Entry *e, int manageDSAit );
+static int doPreAddPluginFNs( Backend *be, Slapi_PBlock *pb );
+static void doPostAddPluginFNs( Backend *be, Slapi_PBlock *pb );
+#endif /* LDAP_SLAPI */
int
do_add( Connection *conn, Operation *op )
const char *text;
int rc = LDAP_SUCCESS;
int manageDSAit;
-
- Slapi_PBlock *pb = op->o_pb;
+#ifdef LDAP_SLAPI
+ Slapi_PBlock *pb = NULL;
+#endif /* LDAP_SLAPI */
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY, "do_add: conn %d enter\n", conn->c_connid,0,0 );
Modifications *mod;
ber_tag_t rtag;
- rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_bvalues );
+#ifdef SLAP_NVALUES
+ tmp.sml_nvalues = NULL;
+#endif
+
+ rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_values );
if ( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
goto done;
}
- if ( tmp.sml_bvalues == NULL ) {
+ if ( tmp.sml_values == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO,
"do_add: conn %d no values for type %s\n",
NULL, "no values for attribute type", NULL, NULL );
goto done;
}
+
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_values = tmp.sml_values;
+#ifdef SLAP_NVALUES
+ mod->sml_nvalues = NULL;
+#endif
*modtail = mod;
modtail = &mod->sml_next;
goto done;
}
-#if defined( LDAP_SLAPI )
- slapi_pblock_set( pb, SLAPI_BACKEND, (void *)be );
- slapi_pblock_set( pb, SLAPI_CONNECTION, (void *)conn );
- slapi_pblock_set( pb, SLAPI_OPERATION, (void *)op );
- slapi_pblock_set( pb, SLAPI_ADD_ENTRY, (void *)e );
- slapi_pblock_set( pb, SLAPI_ADD_TARGET, (void *)dn.bv_val );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)(1) );
- slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)op->o_ctrls );
-
- rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_ADD_FN, pb );
- if ( rc != 0 && rc != LDAP_OTHER ) {
- /*
- * either there is no preOp (add) plugins
- * or a plugin failed. Just log it
- *
- * FIXME: is this correct?
- */
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_add: add preOps failed\n"));
-#else
- Debug (LDAP_DEBUG_TRACE, " add preOps failed.\n", 0, 0, 0);
-#endif
- }
-#endif /* defined( LDAP_SLAPI ) */
+#ifdef LDAP_SLAPI
+ pb = initAddPlugin( be, conn, op, &dn, e, manageDSAit );
+#endif /* LDAP_SLAPI */
/*
* do the add if 1 && (2 || 3)
goto done;
}
+#ifdef LDAP_SLAPI
+ /*
+ * Call the preoperation plugin here, because the entry
+ * will actually contain something.
+ */
+ rc = doPreAddPluginFNs( be, pb );
+ if ( rc != LDAP_SUCCESS ) {
+ /* plugin will have sent result */
+ goto done;
+ }
+#endif /* LDAP_SLAPI */
+
if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
#ifdef SLAPD_MULTIMASTER
if ( !repl_user )
#ifndef SLAPD_MULTIMASTER
} else {
- BerVarray defref = be->be_update_refs
+ BerVarray defref;
+ BerVarray ref;
+#ifdef LDAP_SLAPI
+ /*
+ * SLAPI_ADD_ENTRY will be empty, but this may be acceptable
+ * on replicas (for now, it involves the minimum code intrusion).
+ */
+ rc = doPreAddPluginFNs( be, pb );
+ if ( rc != LDAP_SUCCESS ) {
+ /* plugin will have sent result */
+ goto done;
+ }
+#endif /* LDAP_SLAPI */
+
+ defref = be->be_update_refs
? be->be_update_refs : default_referral;
- BerVarray ref = referral_rewrite( defref,
+ ref = referral_rewrite( defref,
NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
ref ? ref : defref, NULL );
if ( ref ) ber_bvarray_free( ref );
-#endif
+#endif /* SLAPD_MULTIMASTER */
}
} else {
+#ifdef LDAP_SLAPI
+ rc = doPreAddPluginFNs( be, pb );
+ if ( rc != LDAP_SUCCESS ) {
+ /* plugin will have sent result */
+ goto done;
+ }
+#endif
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO,
"do_add: conn %d no backend support\n", conn->c_connid, 0, 0 );
NULL, "operation not supported within namingContext", NULL, NULL );
}
-#if defined( LDAP_SLAPI )
- rc = doPluginFNs( be, SLAPI_PLUGIN_POST_ADD_FN, pb );
- if ( rc != 0 && rc != LDAP_OTHER ) {
- /*
- * either there is no postOp (Add) plugins
- * or a plugin failed. Just log it
- *
- * FIXME: is this correct?
- */
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO, "do_add: Add postOps failed\n"));
-#else
- Debug (LDAP_DEBUG_TRACE, " Add postOps failed.\n", 0, 0, 0);
-#endif
- }
-#endif /* defined( LDAP_SLAPI ) */
+#ifdef LDAP_SLAPI
+ doPostAddPluginFNs( be, pb );
+#endif /* LDAP_SLAPI */
done:
if( modlist != NULL ) {
for( i=0; attr->a_vals[i].bv_val; i++ ) {
/* count them */
}
- for( j=0; mods->sml_bvalues[j].bv_val; j++ ) {
+ for( j=0; mods->sml_values[j].bv_val; j++ ) {
/* count them */
}
j++; /* NULL */
/* should check for duplicates */
- AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
+ AC_MEMCPY( &attr->a_vals[i], mods->sml_values,
sizeof( struct berval ) * j );
/* trim the mods array */
- ch_free( mods->sml_bvalues );
- mods->sml_bvalues = NULL;
+ ch_free( mods->sml_values );
+ mods->sml_values = NULL;
+
+#ifdef SLAP_NVALUES
+ if( attr->a_nvals ) {
+ attr->a_nvals = ch_realloc( attr->a_nvals,
+ sizeof( struct berval ) * (i+j) );
+
+ AC_MEMCPY( &attr->a_nvals[i], mods->sml_nvalues,
+ sizeof( struct berval ) * j );
+
+ /* trim the mods array */
+ ch_free( mods->sml_nvalues );
+ mods->sml_nvalues = NULL;
+ }
+#endif
continue;
#else
#endif
}
- if( mods->sml_bvalues[1].bv_val != NULL ) {
+ if( mods->sml_values[1].bv_val != NULL ) {
/* check for duplicates */
int i, j;
MatchingRule *mr = mods->sml_desc->ad_type->sat_equality;
char textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' };
rc = modify_check_duplicates( mods->sml_desc, mr,
- NULL, mods->sml_bvalues,
+ NULL, mods->sml_bvalues, 0,
&text, textbuf, sizeof( textbuf ) );
if ( rc != LDAP_SUCCESS ) {
/* move values to attr structure */
/* should check for duplicates */
- attr->a_vals = mods->sml_bvalues;
- mods->sml_bvalues = NULL;
+ attr->a_vals = mods->sml_values;
+ mods->sml_values = NULL;
+
+#ifdef SLAP_NVALUES
+ attr->a_nvals = mods->sml_nvalues;
+ mods->sml_nvalues = NULL;
+#endif
*tail = attr;
tail = &attr->a_next;
return LDAP_SUCCESS;
}
+
+#ifdef LDAP_SLAPI
+static Slapi_PBlock *initAddPlugin( Backend *be, Connection *conn, Operation *op,
+ struct berval *dn, Entry *e, int manageDSAit )
+{
+ Slapi_PBlock *pb;
+
+ pb = op->o_pb;
+
+ slapi_x_backend_set_pb( pb, be );
+ slapi_x_connection_set_pb( pb, conn );
+ slapi_x_operation_set_pb( pb, op );
+
+ slapi_pblock_set( pb, SLAPI_ADD_TARGET, (void *)dn->bv_val );
+ slapi_pblock_set( pb, SLAPI_ADD_ENTRY, (void *)e );
+ slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
+
+ return pb;
+}
+
+static int doPreAddPluginFNs( Backend *be, Slapi_PBlock *pb )
+{
+ int rc;
+
+ rc = doPluginFNs( be, SLAPI_PLUGIN_PRE_ADD_FN, pb );
+ if ( rc != 0 ) {
+ /*
+ * A preoperation plugin failure will abort the
+ * entire operation.
+ */
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO, "do_add: add preoperation plugin failed\n",
+ 0, 0, 0);
+#else
+ Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
+ 0, 0, 0);
+ if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
+ rc = LDAP_OTHER;
+#endif
+ } else {
+ rc = LDAP_SUCCESS;
+ }
+
+ return rc;
+}
+
+static void doPostAddPluginFNs( Backend *be, Slapi_PBlock *pb )
+{
+ int rc;
+
+ rc = doPluginFNs( be, SLAPI_PLUGIN_POST_ADD_FN, pb );
+ if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, INFO, "do_add: add postoperation plugin failed\n",
+ 0, 0, 0);
+#else
+ Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
+ 0, 0, 0);
+#endif
+ }
+}
+#endif /* LDAP_SLAPI */
projects / openldap / blobdiff