X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=e45ded2ae6a9dd06483bc095b39a54bf3c952399;hb=517fa54bb0f764968ca56e7931a09adac4f33af6;hp=6293b44ebb0e1dbdf5cab8fe09b2546f3e0f4e65;hpb=f9db1ea88905734aef29cac9eb6bfffd5420e14e;p=openldap

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 6293b44ebb..e45ded2ae6 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
@@ -13,24 +18,32 @@
 #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"
 
-static void	add_created_attrs(Operation *op, Entry *e);
+static int slap_mods2entry(
+	Modifications *mods,
+	Entry **e,
+	const char **text );
 
-void
+int
 do_add( Connection *conn, Operation *op )
 {
 	BerElement	*ber = op->o_ber;
-	char		*dn, *last;
+	char		*dn, *ndn, *last;
 	ber_len_t	len;
 	ber_tag_t	tag;
 	Entry		*e;
 	Backend		*be;
+	LDAPModList	*modlist = NULL;
+	LDAPModList	**modtail = &modlist;
+	Modifications *mods = NULL;
+	const char *text;
+	int			rc = LDAP_SUCCESS;
 
 	Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
 
@@ -49,69 +62,85 @@ do_add( Connection *conn, Operation *op )
 	/* get the name */
 	if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
 		Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-		    "decoding error" );
-		return;
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		return -1;
+	}
+
+	ndn = ch_strdup( dn );
+
+	if ( dn_normalize( ndn ) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
+		send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, NULL,
+		    "invalid DN", NULL, NULL );
+		free( dn );
+		free( ndn );
+		return LDAP_INVALID_DN_SYNTAX;
 	}
 
 	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
 	e->e_dn = dn;
-	e->e_ndn = dn_normalize_case( ch_strdup( dn ) );
+	e->e_ndn = ndn;
+	e->e_attrs = NULL;
 	e->e_private = NULL;
 
-	dn = NULL;
-
-	Debug( LDAP_DEBUG_ARGS, "    do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
+	Debug( LDAP_DEBUG_ARGS, "do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
 
 	/* get the attrs */
-	e->e_attrs = NULL;
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-	    tag = ber_next_element( ber, &len, last ) ) {
-		char		*type;
-		struct berval	**vals;
-
-		if ( ber_scanf( ber, "{a{V}}", &type, &vals ) == LBER_ERROR ) {
-			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
-			    NULL, "decoding error" );
-			entry_free( e );
-			return;
+	    tag = ber_next_element( ber, &len, last ) )
+	{
+		LDAPModList *mod = (LDAPModList *) ch_malloc( sizeof(LDAPModList) );
+		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 ) {
+			Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
+			send_ldap_disconnect( conn, op,
+				LDAP_PROTOCOL_ERROR, "decoding error" );
+			rc = -1;
+			free( mod );
+			goto done;
 		}
 
-		if ( vals == NULL ) {
-			Debug( LDAP_DEBUG_ANY, "no values for type %s\n", type,
-			    0, 0 );
-			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-			    NULL );
-			free( type );
-			entry_free( e );
-			return;
+		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 attribute type", NULL, NULL );
+			free( mod->ml_type );
+			free( mod );
+			goto done;
 		}
 
-		attr_merge( e, type, vals );
-
-		free( type );
-		ber_bvecfree( vals );
+		*modtail = mod;
+		modtail = &mod->ml_next;
 	}
 
 	if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
-		entry_free( e );
 		Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-		    "decoding error" );
-		return;
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		rc = -1;
+		goto done;
 	}
 
-#ifdef GET_CTRLS
-	if( get_ctrls( conn, op, 1 ) == -1 ) {
-		entry_free( e );
+	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
-		return;
+		goto done;
 	} 
-#endif
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d ADD dn=\"%s\"\n",
-	    conn->c_connid, op->o_opid, e->e_ndn, 0, 0 );
+	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 );
 
 	/*
 	 * We could be serving multiple database backends.  Select the
@@ -120,10 +149,31 @@ do_add( Connection *conn, Operation *op )
 	 */
 	be = select_backend( e->e_ndn );
 	if ( be == NULL ) {
-		entry_free( e );
-		send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-		    default_referral );
-		return;
+		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 ) ;
+	if( rc != LDAP_SUCCESS ) {
+		send_ldap_result( conn, op, rc,
+			NULL, text, NULL, NULL );
+		goto done;
+	}
+
+	/* check for referrals */
+	rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn );
+	if ( rc != LDAP_SUCCESS ) {
+		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 );
+		goto done;
 	}
 
 	/*
@@ -134,81 +184,152 @@ do_add( Connection *conn, Operation *op )
 	 */
 	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 )
+#endif
 		{
+			int update = be->be_update_ndn != NULL;
+
+			rc = slap_modlist2mods( modlist, update, &mods, &text );
+			if( rc != LDAP_SUCCESS ) {
+				send_ldap_result( conn, op, rc,
+					NULL, text, NULL, NULL );
+				goto done;
+			}
+
+#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
+			{
+				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 );
+					goto done;
+				}
+			}
 
-				add_created_attrs( op, e );
+			rc = slap_mods2entry( mods, &e, &text );
+			if( rc != LDAP_SUCCESS ) {
+				send_ldap_result( conn, op, rc,
+					NULL, text, NULL, NULL );
+				goto done;
 			}
+
 			if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
-				replog( be, LDAP_REQ_ADD, e->e_dn, e, 0 );
+#ifdef SLAPD_MULTIMASTER
+				if (be->be_update_ndn == NULL ||
+					strcmp( be->be_update_ndn, op->o_ndn ))
+#endif
+				{
+					replog( be, op, e->e_dn, e );
+				}
 				be_entry_release_w( be, e );
+				e = NULL;
 			}
 
+#ifndef SLAPD_MULTIMASTER
 		} else {
-			entry_free( e );
-			send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-			    default_referral );
+			send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
+				be->be_update_refs ? be->be_update_refs : default_referral, 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, "operation not supported within namingContext", NULL, NULL );
+	}
+
+done:
+	if( modlist != NULL ) {
+		slap_modlist_free( modlist );
+	}
+	if( mods != NULL ) {
+		slap_mods_free( mods );
+	}
+	if( e != NULL ) {
 		entry_free( e );
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-		    "Function not implemented" );
 	}
+
+	return rc;
 }
 
-static void
-add_created_attrs( Operation *op, Entry *e )
+static int slap_mods2entry(
+	Modifications *mods,
+	Entry **e,
+	const char **text )
 {
-	char		buf[22];
-	struct berval	bv;
-	struct berval	*bvals[2];
-	Attribute	**a, **next;
-	Attribute	*tmp;
-	struct tm	*ltm;
-	time_t		currenttime;
-
-	Debug( LDAP_DEBUG_TRACE, "add_created_attrs\n", 0, 0, 0 );
-
-	bvals[0] = &bv;
-	bvals[1] = NULL;
-
-	/* remove any attempts by the user to add these attrs */
-	for ( a = &e->e_attrs; *a != NULL; a = next ) {
-		if ( oc_check_operational( (*a)->a_type ) ) {
-			tmp = *a;
-			*a = (*a)->a_next;
-			attr_free( tmp );
-			next = a;
-		} else {
-			next = &(*a)->a_next;
-		}
-	}
+	Attribute **tail = &(*e)->e_attrs;
+	assert( *tail == NULL );
 
-	if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-		bv.bv_val = "NULLDN";
-		bv.bv_len = strlen( bv.bv_val );
-	} else {
-		bv.bv_val = op->o_dn;
-		bv.bv_len = strlen( bv.bv_val );
-	}
-	attr_merge( e, "creatorsname", bvals );
+	for( ; mods != NULL; mods = mods->sml_next ) {
+		Attribute *attr;
+
+		assert( mods->sml_op == LDAP_MOD_ADD );
+		assert( mods->sml_desc != NULL );
 
-	currenttime = slap_get_time();
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#ifndef LDAP_LOCALTIME
-	ltm = gmtime( &currenttime );
-	strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
+		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 */
+			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
-	ltm = localtime( &currenttime );
-	strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+			*text = "attribute provided more than once";
+			return LDAP_TYPE_OR_VALUE_EXISTS;
 #endif
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+		}
+
+		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;
 
-	bv.bv_val = buf;
-	bv.bv_len = strlen( bv.bv_val );
-	attr_merge( e, "createtimestamp", bvals );
+		*tail = attr;
+		tail = &attr->a_next;
+	}
+
+	return LDAP_SUCCESS;
 }
+