/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
#include "ldap_pvt.h"
#include "slap.h"
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+static int slap_mods2entry(
+ Modifications *mods,
+ Entry **e,
+ const char **text );
+#else
static int add_created_attrs(Operation *op, Entry *e);
+#endif
int
do_add( Connection *conn, Operation *op )
ber_tag_t tag;
Entry *e;
Backend *be;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ LDAPModList *modlist = NULL;
+ LDAPModList **modtail = &modlist;
+ Modifications *mods = NULL;
+#endif
+ const char *text;
int rc = LDAP_SUCCESS;
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
- if( op->o_bind_in_progress ) {
- Debug( LDAP_DEBUG_ANY, "do_add: SASL bind in progress.\n", 0, 0, 0 );
- send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
- "SASL bind in progress", NULL, NULL );
- return LDAP_SASL_BIND_IN_PROGRESS;
- }
-
/*
* Parse the add request. It looks like this:
*
/* get the attrs */
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
- tag = ber_next_element( ber, &len, last ) ) {
- char *type;
- struct berval **vals;
+ tag = ber_next_element( ber, &len, last ) )
+ {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ LDAPModList *mod = (LDAPModList *) ch_malloc( sizeof(LDAPModList) );
+#else
+ LDAPModList tmpmod;
+ LDAPModList *mod = &tmpmod;
+#endif
+ mod->ml_op = LDAP_MOD_ADD;
+ mod->ml_next = NULL;
+
+ rc = ber_scanf( ber, "{a{V}}", &mod->ml_type, &mod->ml_bvalues );
- if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) {
+ if ( rc == LBER_ERROR ) {
+ Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
rc = -1;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ free( mod );
+#endif
goto done;
}
- if ( vals == NULL ) {
- Debug( LDAP_DEBUG_ANY, "no values for type %s\n", type,
- 0, 0 );
+ if ( mod->ml_bvalues == NULL ) {
+ Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
+ mod->ml_type, 0, 0 );
send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
- NULL, "no values for type", NULL, NULL );
- free( type );
+ NULL, "no values for attribute type", NULL, NULL );
+ free( mod->ml_type );
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ free( mod );
+#endif
goto done;
}
- attr_merge( e, type, vals );
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ *modtail = mod;
+ modtail = &mod->ml_next;
+#else
+ attr_merge( e, mod->ml_type, mod->ml_bvalues );
- free( type );
- ber_bvecfree( vals );
+ free( mod->ml_type );
+ ber_bvecfree( mod->ml_bvalues );
+#endif
}
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
goto done;
}
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ if ( modlist == NULL )
+#else
+ if ( e->e_attrs == NULL )
+#endif
+ {
+ send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
+ NULL, "no attributes provided", NULL, NULL );
+ goto done;
+ }
+
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
*/
be = select_backend( e->e_ndn );
if ( be == NULL ) {
- send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL,
- NULL, default_referral, NULL );
+ send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+ NULL, NULL, default_referral, NULL );
goto done;
}
/* make sure this backend recongizes critical controls */
- rc = backend_check_controls( be, conn, op ) ;
+ rc = backend_check_controls( be, conn, op, &text ) ;
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
- NULL, NULL, NULL, NULL );
+ NULL, text, NULL, NULL );
goto done;
}
Debug( LDAP_DEBUG_ANY, "do_add: database is read-only\n",
0, 0, 0 );
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "database is read-only", NULL, NULL );
+ NULL, "directory is read-only", NULL, NULL );
goto done;
}
strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
#endif
{
+ int update = be->be_update_ndn != NULL;
+
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ rc = slap_modlist2mods( modlist, update, &mods, &text );
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL );
+ goto done;
+ }
+
+#endif
#ifndef SLAPD_MULTIMASTER
if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && be->be_update_ndn == NULL )
+ global_lastmod == ON)) && !update )
#endif
{
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ Modifications **modstail;
+ for( modstail = &mods;
+ *modstail != NULL;
+ modstail = &(*modstail)->sml_next )
+ {
+ assert( (*modstail)->sml_op == LDAP_MOD_ADD );
+ assert( (*modstail)->sml_desc != NULL );
+ }
+ rc = slap_mods_opattrs( op, modstail, &text );
+#else
+ char *text = "no-user-modification attribute type";
rc = add_created_attrs( op, e );
-
+#endif
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
- NULL, "no-user-modification attribute type",
- NULL, NULL );
+ NULL, text, NULL, NULL );
goto done;
}
}
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ rc = slap_mods2entry( mods, &e, &text );
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc,
+ NULL, text, NULL, NULL );
+ goto done;
+ }
+#endif
+
if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
#ifdef SLAPD_MULTIMASTER
if (be->be_update_ndn == NULL ||
#endif
}
} else {
- Debug( LDAP_DEBUG_ARGS, " do_add: HHH\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "Function not implemented", NULL, NULL );
+ NULL, "operation not supported within namingContext", NULL, NULL );
}
done:
- if( e ) {
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ if( modlist != NULL ) {
+ slap_modlist_free( modlist );
+ }
+ if( mods != NULL ) {
+ slap_mods_free( mods );
+ }
+#endif
+ if( e != NULL ) {
entry_free( e );
}
return rc;
}
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+static int slap_mods2entry(
+ Modifications *mods,
+ Entry **e,
+ const char **text )
+{
+ Attribute **tail = &(*e)->e_attrs;
+ assert( *tail == NULL );
+
+ for( ; mods != NULL; mods = mods->sml_next ) {
+ Attribute *attr;
+
+ assert( mods->sml_op == LDAP_MOD_ADD );
+ assert( mods->sml_desc != NULL );
+
+ attr = attr_find( (*e)->e_attrs, mods->sml_desc );
+
+ if( attr != NULL ) {
+ *text = "attribute provided more than once";
+ return LDAP_OPERATIONS_ERROR;
+ }
+
+ attr = ch_calloc( 1, sizeof(Attribute) );
+
+ /* move ad to attr structure */
+ attr->a_desc = mods->sml_desc;
+ mods->sml_desc = NULL;
+
+ /* move values to attr structure */
+ /* should check for duplicates */
+ attr->a_vals = mods->sml_bvalues;
+ mods->sml_bvalues = NULL;
+
+ *tail = attr;
+ tail = &attr->a_next;
+ }
+
+ return LDAP_SUCCESS;
+}
+
+#else
static int
add_created_attrs( Operation *op, Entry *e )
{
/* return error on any attempts by the user to add these attrs */
for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( is_at_no_user_mod( a->a_desc.ad_type ))
-#else
- if ( oc_check_op_no_usermod_attr( a->a_type ) )
-#endif
- {
+ if ( oc_check_op_no_usermod_attr( a->a_type ) ) {
return LDAP_CONSTRAINT_VIOLATION;
}
}
if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- bv.bv_val = "<anonymous>";
- bv.bv_len = sizeof("<anonymous>")-1;
+ bv.bv_val = SLAPD_ANONYMOUS;
+ bv.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
;
} else {
bv.bv_val = op->o_dn;
return LDAP_SUCCESS;
}
+#endif
projects / openldap / blobdiff