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

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index e7819727fa..e45ded2ae6 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,6 +1,6 @@
 /* $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
  */
 /*
@@ -18,7 +18,6 @@
 #include "portable.h"
 
 #include <stdio.h>
-
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/socket.h>
@@ -26,14 +25,10 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 static int slap_mods2entry(
 	Modifications *mods,
 	Entry **e,
-	char **text );
-#else
-static int	add_created_attrs(Operation *op, Entry *e);
-#endif
+	const char **text );
 
 int
 do_add( Connection *conn, Operation *op )
@@ -44,12 +39,10 @@ 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
-	char *text;
+	const char *text;
 	int			rc = LDAP_SUCCESS;
 
 	Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
@@ -92,29 +85,24 @@ do_add( Connection *conn, Operation *op )
 	e->e_attrs = NULL;
 	e->e_private = 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 */
 	for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
-	    tag = ber_next_element( ber, &len, last ) ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+	    tag = ber_next_element( ber, &len, last ) )
+	{
 		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 ) {
+			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;
 		}
 
@@ -124,21 +112,12 @@ do_add( Connection *conn, Operation *op )
 			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)->ml_next = mod;
+		*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 ) {
@@ -154,12 +133,7 @@ do_add( Connection *conn, Operation *op )
 		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;
@@ -182,13 +156,18 @@ do_add( Connection *conn, Operation *op )
 
 	/* 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 );
@@ -216,7 +195,6 @@ do_add( Connection *conn, Operation *op )
 		{
 			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,
@@ -224,18 +202,20 @@ do_add( Connection *conn, Operation *op )
 				goto done;
 			}
 
-#endif
 #ifndef SLAPD_MULTIMASTER
 			if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
 				global_lastmod == ON)) && !update )
 #endif
 			{
-#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 );
@@ -243,14 +223,12 @@ do_add( Connection *conn, Operation *op )
 				}
 			}
 
-#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
@@ -261,8 +239,8 @@ do_add( Connection *conn, Operation *op )
 					replog( be, op, e->e_dn, e );
 				}
 				be_entry_release_w( be, e );
+				e = NULL;
 			}
-			e = NULL;
 
 #ifndef SLAPD_MULTIMASTER
 		} else {
@@ -271,20 +249,18 @@ do_add( Connection *conn, Operation *op )
 #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, "read function not implemented", NULL, NULL );
+			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 );
 	}
@@ -292,11 +268,10 @@ done:
 	return rc;
 }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 static int slap_mods2entry(
 	Modifications *mods,
 	Entry **e,
-	char **text )
+	const char **text )
 {
 	Attribute **tail = &(*e)->e_attrs;
 	assert( *tail == NULL );
@@ -305,17 +280,49 @@ static int slap_mods2entry(
 		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;
+#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
+			*text = "attribute provided more than once";
+			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;
 
@@ -326,56 +333,3 @@ static int slap_mods2entry(
 	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 ) {
-#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
-		{
-			return LDAP_CONSTRAINT_VIOLATION;
-		}
-	}
-
-	if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
-		bv.bv_val = "<anonymous>";
-		bv.bv_len = sizeof("<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( &currenttime );
-	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