#include "portable.h"
#include <stdio.h>
-
#include <ac/string.h>
#include <ac/time.h>
#include <ac/socket.h>
#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;
+ int manageDSAit;
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+ "do_add: conn %d enter\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
-
+#endif
/*
* Parse the add request. It looks like this:
*
/* get the name */
if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
return -1;
ndn = ch_strdup( dn );
if ( dn_normalize( ndn ) == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
+#endif
send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, NULL,
"invalid DN", NULL, NULL );
free( dn );
e->e_attrs = NULL;
e->e_private = NULL;
- Debug( LDAP_DEBUG_ARGS, " do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+ "do_add: conn %d ndn (%s)\n", conn->c_connid, e->e_ndn ));
+#else
+ Debug( LDAP_DEBUG_ARGS, "do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
+#endif
/* get the attrs */
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
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 ( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_add: conn %d decoding error \n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
rc = -1;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
free( mod );
-#endif
goto done;
}
if ( mod->ml_bvalues == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_add: conn %d no values for type %s\n",
+ conn->c_connid, mod->ml_type ));
+#else
Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
mod->ml_type, 0, 0 );
+#endif
send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
NULL, "no values for attribute type", NULL, NULL );
free( mod->ml_type );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
free( mod );
-#endif
goto done;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
*modtail = mod;
modtail = &mod->ml_next;
-#else
- attr_merge( e, mod->ml_type, mod->ml_bvalues );
-
- free( mod->ml_type );
- ber_bvecfree( mod->ml_bvalues );
-#endif
}
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_add: conn %d ber_scanf failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
+#endif
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
rc = -1;
}
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_add: conn %d get_ctrls failed\n", conn->c_connid ));
+#else
Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
+#endif
goto done;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( modlist == NULL )
-#else
- if ( e->e_attrs == NULL )
-#endif
- {
+ if ( modlist == NULL ) {
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 );
+ if( e->e_ndn == NULL || *e->e_ndn == '\0' ) {
+ /* protocolError may be a more appropriate error */
+ send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
+ NULL, "root DSE exists", NULL, NULL );
+ goto done;
+ }
+
+ manageDSAit = get_manageDSAit( op );
+
/*
* We could be serving multiple database backends. Select the
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- be = select_backend( e->e_ndn );
+ be = select_backend( e->e_ndn, manageDSAit );
if ( be == 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, &text ) ;
-
+ /* check restrictions */
+ rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
goto done;
}
- if ( global_readonly || be->be_readonly ) {
- 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, "directory is read-only", NULL, NULL );
+ /* check for referrals */
+ rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn );
+ if ( rc != LDAP_SUCCESS ) {
goto done;
}
*/
if ( be->be_add ) {
/* do the update here */
-#ifdef SLAPD_MULTIMASTER
- if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
- global_lastmod == ON)) && (be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn )) )
-#else
- if ( be->be_update_ndn == NULL ||
- strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+ int repl_user = (be->be_update_ndn != NULL &&
+ strcmp( be->be_update_ndn, op->o_ndn ) == 0);
+#ifndef SLAPD_MULTIMASTER
+ if ( be->be_update_ndn == NULL || repl_user )
#endif
{
int update = be->be_update_ndn != NULL;
+ char textbuf[SLAP_TEXT_BUFLEN];
+ size_t textlen = sizeof textbuf;
+
+ rc = slap_modlist2mods( modlist, update, &mods, &text,
+ textbuf, textlen );
-#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)) && !update )
-#endif
+ global_lastmod == ON)) && !repl_user )
{
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = slap_mods_opattrs( op, &mods, &text );
-#else
- char *text = "no-user-modification attribute type";
- rc = add_created_attrs( op, e );
-#endif
+ 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 );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
}
}
-#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 ||
- strcmp( be->be_update_ndn, op->o_ndn ))
+ if ( !repl_user )
#endif
{
replog( be, op, e->e_dn, e );
}
- be_entry_release_w( be, e );
+ be_entry_release_w( be, conn, op, e );
e = NULL;
}
#endif
}
} else {
- Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "operation not supported within namingContext", NULL, NULL );
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_add: conn %d no backend support\n", conn->c_connid ));
+#else
+ Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
+#endif
+ send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+ NULL, "operation not supported within namingContext", NULL, NULL );
}
done:
-#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,
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 ) {
+#define SLURPD_FRIENDLY
+#ifdef SLURPD_FRIENDLY
+ ber_len_t i,j;
+
+ for( i=0; attr->a_vals[i]; i++ ) {
+ /* count them */
+ }
+ for( j=0; mods->sml_bvalues[j]; j++ ) {
+ /* count them */
+ }
+ j++; /* NULL */
+
+ attr->a_vals = ch_realloc( attr->a_vals,
+ sizeof( struct berval * ) * (i+j) );
+
+ /* should check for duplicates */
+ AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
+ sizeof( struct berval * ) * j );
+
+ /* trim the mods array */
+ ch_free( mods->sml_bvalues );
+ mods->sml_bvalues = NULL;
+
+ continue;
+#else
*text = "attribute provided more than once";
- return LDAP_OPERATIONS_ERROR;
+ return LDAP_TYPE_OR_VALUE_EXISTS;
+#endif
}
attr = ch_calloc( 1, sizeof(Attribute) );
- /* should check for duplicates */
+ /* 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;
return LDAP_SUCCESS;
}
-#else
-static int
-add_created_attrs( Operation *op, Entry *e )
-{
- char buf[22];
- struct berval bv;
- struct berval *bvals[2];
- Attribute *a;
- struct tm *ltm;
- time_t currenttime;
-
- Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 );
-
- bvals[0] = &bv;
- bvals[1] = NULL;
-
- /* return error on any attempts by the user to add these attrs */
- for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
- 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 = SLAPD_ANONYMOUS;
- bv.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
-;
- } else {
- bv.bv_val = op->o_dn;
- bv.bv_len = strlen( bv.bv_val );
- }
- attr_merge( e, "creatorsname", bvals );
- attr_merge( e, "modifiersname", bvals );
-
- currenttime = slap_get_time();
- ldap_pvt_thread_mutex_lock( &gmtime_mutex );
- ltm = gmtime( ¤ttime );
- strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
- ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-
- bv.bv_val = buf;
- bv.bv_len = strlen( bv.bv_val );
- attr_merge( e, "createtimestamp", bvals );
- attr_merge( e, "modifytimestamp", bvals );
-
- return LDAP_SUCCESS;
-}
-#endif
projects / openldap / blobdiff