X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=0f0c716375f167e6de35b1ba47d6d786746912de;hb=69343add5ac17c2300e256c85acf3279298a0fbe;hp=d3d334d0abf1b95caffa4dc7d4646165c01457dc;hpb=55501e886f54d857db7a8e7b95e8a0310596188b;p=openldap

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index d3d334d0ab..0f0c716375 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -50,8 +50,7 @@ do_modify(
 	int manageDSAit;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		"do_modify: enter\n" ));
+	LDAP_LOG( OPERATION, ENTRY, "do_modify: enter\n", 0, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
 #endif
@@ -77,8 +76,7 @@ do_modify(
 
 	if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_modify: ber_scanf failed\n" ));
+		LDAP_LOG( OPERATION, ERR, "do_modify: ber_scanf failed\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -89,8 +87,7 @@ do_modify(
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-		   "do_modify: dn (%s)\n", dn.bv_val ));
+	LDAP_LOG( OPERATION, ARGS, "do_modify: dn (%s)\n", dn.bv_val, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn.bv_val, 0, 0 );
 #endif
@@ -117,18 +114,20 @@ do_modify(
 		}
 
 		mod = (Modifications *) ch_malloc( sizeof(Modifications) );
+		mod->sml_op = mop;
 		mod->sml_type = tmp.sml_type;
 		mod->sml_bvalues = tmp.sml_bvalues;
 		mod->sml_desc = NULL;
+		mod->sml_next =NULL;
 		*modtail = mod;
 
 		switch( mop ) {
 		case LDAP_MOD_ADD:
 			if ( mod->sml_bvalues == NULL ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+				LDAP_LOG( OPERATION, ERR, 
 					"do_modify: modify/add operation (%ld) requires values\n",
-					(long)mop ));
+					(long)mop, 0, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY,
 					"do_modify: modify/add operation (%ld) requires values\n",
@@ -150,9 +149,8 @@ do_modify(
 
 		default: {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-					"do_modify: invalid modify operation (%ld)\n",
-					(long)mop ));
+				LDAP_LOG( OPERATION, ERR, 
+					"do_modify: invalid modify operation (%ld)\n", (long)mop, 0, 0 );
 #else
 				Debug( LDAP_DEBUG_ANY,
 					"do_modify: invalid modify operation (%ld)\n",
@@ -166,15 +164,13 @@ do_modify(
 			}
 		}
 
-		mod->sml_op = mop;
 		modtail = &mod->sml_next;
 	}
 	*modtail = NULL;
 
 	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_modify: get_ctrls failed\n" ));
+		LDAP_LOG( OPERATION, ERR, "do_modify: get_ctrls failed\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -185,9 +181,8 @@ do_modify(
 	rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
 	if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			"do_modify: conn %d  invalid dn (%s)\n",
-			conn->c_connid, dn.bv_val ));
+		LDAP_LOG( OPERATION, INFO, "do_modify: conn %d  invalid dn (%s)\n",
+			conn->c_connid, dn.bv_val, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"do_modify: invalid dn (%s)\n", dn.bv_val, 0, 0 );
@@ -199,8 +194,8 @@ do_modify(
 
 	if( ndn.bv_len == 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_modify: attempt to modify root DSE.\n" ));
+		LDAP_LOG( OPERATION, ERR, 
+			"do_modify: attempt to modify root DSE.\n",0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_modify: root dse!\n", 0, 0, 0 );
 #endif
@@ -209,11 +204,10 @@ do_modify(
 			NULL, "modify upon the root DSE not supported", NULL, NULL );
 		goto cleanup;
 
-#if defined( SLAPD_SCHEMA_DN )
-	} else if ( strcasecmp( ndn.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
+	} else if ( bvmatch( &ndn, &global_schemandn ) ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			"do_modify: attempt to modify subschema subentry.\n" ));
+		LDAP_LOG( OPERATION, ERR,
+			"do_modify: attempt to modify subschema subentry.\n" , 0, 0, 0  );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_modify: subschema subentry!\n", 0, 0, 0 );
 #endif
@@ -222,36 +216,30 @@ do_modify(
 			NULL, "modification of subschema subentry not supported",
 			NULL, NULL );
 		goto cleanup;
-#endif
 	}
 
 #ifdef LDAP_DEBUG
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-		"do_modify: modifications:\n" ));
+	LDAP_LOG( OPERATION, DETAIL1, "do_modify: modifications:\n", 0, 0, 0  );
 #else
 	Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
 #endif
 
 	for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-			"\t%s:  %s\n", tmp->sml_op == LDAP_MOD_ADD ?
-				"add" : (tmp->sml_op == LDAP_MOD_DELETE ?
-					"delete" : "replace"), tmp->sml_type.bv_val ));
+		LDAP_LOG( OPERATION, DETAIL1, "\t%s:  %s\n", 
+			tmp->sml_op == LDAP_MOD_ADD ?
+			"add" : (tmp->sml_op == LDAP_MOD_DELETE ?
+			"delete" : "replace"), tmp->sml_type.bv_val, 0 );
 
 		if ( tmp->sml_bvalues == NULL ) {
-			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-			   "\t\tno values" ));
+			LDAP_LOG( OPERATION, DETAIL1, "\t\tno values", 0, 0, 0 );
 		} else if ( tmp->sml_bvalues[0].bv_val == NULL ) {
-			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-			   "\t\tzero values" ));
+			LDAP_LOG( OPERATION, DETAIL1, "\t\tzero values", 0, 0, 0 );
 		} else if ( tmp->sml_bvalues[1].bv_val == NULL ) {
-			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-			   "\t\tone value" ));
+			LDAP_LOG( OPERATION, DETAIL1, "\t\tone value", 0, 0, 0 );
 		} else {
-			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-			   "\t\tmultiple values" ));
+			LDAP_LOG( OPERATION, DETAIL1, "\t\tmultiple values", 0, 0, 0 );
 		}
 
 #else
@@ -277,7 +265,7 @@ do_modify(
 	}
 #endif
 
-	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MOD dn=\"%s\"\n",
+	Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD dn=\"%s\"\n",
 	    op->o_connid, op->o_opid, dn.bv_val, 0, 0 );
 
 	manageDSAit = get_manageDSAit( op );
@@ -288,13 +276,13 @@ do_modify(
 	 * if we don't hold it.
 	 */
 	if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
-		BVarray ref = referral_rewrite( default_referral,
+		BerVarray ref = referral_rewrite( default_referral,
 			NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
 		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
 			NULL, NULL, ref ? ref : default_referral, NULL );
 
-		bvarray_free( ref );
+		ber_bvarray_free( ref );
 		goto cleanup;
 	}
 
@@ -345,7 +333,7 @@ do_modify(
 				goto cleanup;
 			}
 
-			if ( SLAP_LASTMOD(be) && !repl_user ) {
+			if ( !repl_user ) {
 				for( modtail = &modlist;
 					*modtail != NULL;
 					modtail = &(*modtail)->sml_next )
@@ -353,7 +341,7 @@ do_modify(
 					/* empty */
 				}
 
-				rc = slap_mods_opattrs( op, modlist, modtail, &text,
+				rc = slap_mods_opattrs( be, op, modlist, modtail, &text,
 					textbuf, textlen );
 				if( rc != LDAP_SUCCESS ) {
 					send_ldap_result( conn, op, rc,
@@ -375,15 +363,15 @@ do_modify(
 #ifndef SLAPD_MULTIMASTER
 		/* send a referral */
 		} else {
-			BVarray defref = be->be_update_refs
+			BerVarray defref = be->be_update_refs
 				? be->be_update_refs : default_referral;
-			BVarray ref = referral_rewrite( defref,
+			BerVarray ref = referral_rewrite( defref,
 				NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
 			send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
 				ref ? ref : defref, NULL );
 
-			bvarray_free( ref );
+			ber_bvarray_free( ref );
 #endif
 		}
 	} else {
@@ -449,6 +437,15 @@ int slap_mods_check(
 			return LDAP_UNDEFINED_TYPE;
 		}
 
+		if( slap_ad_is_lang_range( ad )) {
+			/* attribute requires binary transfer */
+			snprintf( textbuf, textlen,
+				"%s: inappropriate use of language range option",
+				ml->sml_type.bv_val );
+			*text = textbuf;
+			return LDAP_UNDEFINED_TYPE;
+		}
+
 		if (!update && is_at_no_user_mod( ad->ad_type )) {
 			/* user modification disallowed */
 			snprintf( textbuf, textlen,
@@ -540,6 +537,7 @@ int slap_mods_check(
 }
 
 int slap_mods_opattrs(
+	Backend *be,
 	Operation *op,
 	Modifications *mods,
 	Modifications **modtail,
@@ -547,10 +545,8 @@ int slap_mods_opattrs(
 	char *textbuf, size_t textlen )
 {
 	struct berval name, timestamp, csn;
-	time_t now = slap_get_time();
-	char timebuf[22];
-	char csnbuf[64];
-	struct tm *ltm;
+	char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+	char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 	Modifications *mod;
 
 	int mop = op->o_tag == LDAP_REQ_ADD
@@ -559,39 +555,44 @@ int slap_mods_opattrs(
 	assert( modtail != NULL );
 	assert( *modtail == NULL );
 
-	ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-	ltm = gmtime( &now );
-	strftime( timebuf, sizeof(timebuf), "%Y%m%d%H%M%SZ", ltm );
+	if( SLAP_LASTMOD(be) ) {
+		struct tm *ltm;
+		time_t now = slap_get_time();
 
-	csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
-	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-	csn.bv_val = csnbuf;
+		ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+		ltm = gmtime( &now );
+		lutil_gentime( timebuf, sizeof(timebuf), ltm );
 
-	timestamp.bv_val = timebuf;
-	timestamp.bv_len = strlen(timebuf);
+		csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
+		ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+		csn.bv_val = csnbuf;
 
-	if( op->o_dn.bv_len == 0 ) {
-		name.bv_val = SLAPD_ANONYMOUS;
-		name.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
-	} else {
-		name = op->o_dn;
+		timestamp.bv_val = timebuf;
+		timestamp.bv_len = strlen(timebuf);
+
+		if( op->o_dn.bv_len == 0 ) {
+			name.bv_val = SLAPD_ANONYMOUS;
+			name.bv_len = sizeof(SLAPD_ANONYMOUS)-1;
+		} else {
+			name = op->o_dn;
+		}
 	}
 
 	if( op->o_tag == LDAP_REQ_ADD ) {
 		struct berval tmpval;
-		char uuidbuf[40];
-		int rc;
 
-		rc = mods_structural_class( mods, &tmpval, text, textbuf, textlen );
-		if( rc != LDAP_SUCCESS ) {
-			return rc;
-		}
-		if ( tmpval.bv_len ) {
+		if( global_schemacheck ) {
+			int rc = mods_structural_class( mods, &tmpval,
+				text, textbuf, textlen );
+			if( rc != LDAP_SUCCESS ) {
+				return rc;
+			}
+
 			mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 			mod->sml_op = mop;
 			mod->sml_type.bv_val = NULL;
 			mod->sml_desc = slap_schema.si_ad_structuralObjectClass;
-			mod->sml_bvalues = (BVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 			ber_dupbv( &mod->sml_bvalues[0], &tmpval );
 			mod->sml_bvalues[1].bv_val = NULL;
 			assert( mod->sml_bvalues[0].bv_val );
@@ -599,15 +600,54 @@ int slap_mods_opattrs(
 			modtail = &mod->sml_next;
 		}
 
-		tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
-		tmpval.bv_val = uuidbuf;
+		if( SLAP_LASTMOD(be) ) {
+			char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
+
+			tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
+			tmpval.bv_val = uuidbuf;
 		
+			mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+			mod->sml_op = mop;
+			mod->sml_type.bv_val = NULL;
+			mod->sml_desc = slap_schema.si_ad_entryUUID;
+			mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			ber_dupbv( &mod->sml_bvalues[0], &tmpval );
+			mod->sml_bvalues[1].bv_val = NULL;
+			assert( mod->sml_bvalues[0].bv_val );
+			*modtail = mod;
+			modtail = &mod->sml_next;
+
+			mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+			mod->sml_op = mop;
+			mod->sml_type.bv_val = NULL;
+			mod->sml_desc = slap_schema.si_ad_creatorsName;
+			mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			ber_dupbv( &mod->sml_bvalues[0], &name );
+			mod->sml_bvalues[1].bv_val = NULL;
+			assert( mod->sml_bvalues[0].bv_val );
+			*modtail = mod;
+			modtail = &mod->sml_next;
+
+			mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+			mod->sml_op = mop;
+			mod->sml_type.bv_val = NULL;
+			mod->sml_desc = slap_schema.si_ad_createTimestamp;
+			mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+			ber_dupbv( &mod->sml_bvalues[0], &timestamp );
+			mod->sml_bvalues[1].bv_val = NULL;
+			assert( mod->sml_bvalues[0].bv_val );
+			*modtail = mod;
+			modtail = &mod->sml_next;
+		}
+	}
+
+	if( SLAP_LASTMOD(be) ) {
 		mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 		mod->sml_op = mop;
 		mod->sml_type.bv_val = NULL;
-		mod->sml_desc = slap_schema.si_ad_entryUUID;
-		mod->sml_bvalues = (BVarray) ch_malloc( 2 * sizeof( struct berval ) );
-		ber_dupbv( &mod->sml_bvalues[0], &tmpval );
+		mod->sml_desc = slap_schema.si_ad_entryCSN;
+		mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+		ber_dupbv( &mod->sml_bvalues[0], &csn );
 		mod->sml_bvalues[1].bv_val = NULL;
 		assert( mod->sml_bvalues[0].bv_val );
 		*modtail = mod;
@@ -616,8 +656,8 @@ int slap_mods_opattrs(
 		mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 		mod->sml_op = mop;
 		mod->sml_type.bv_val = NULL;
-		mod->sml_desc = slap_schema.si_ad_creatorsName;
-		mod->sml_bvalues = (BVarray) ch_malloc( 2 * sizeof( struct berval ) );
+		mod->sml_desc = slap_schema.si_ad_modifiersName;
+		mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 		ber_dupbv( &mod->sml_bvalues[0], &name );
 		mod->sml_bvalues[1].bv_val = NULL;
 		assert( mod->sml_bvalues[0].bv_val );
@@ -627,8 +667,8 @@ int slap_mods_opattrs(
 		mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
 		mod->sml_op = mop;
 		mod->sml_type.bv_val = NULL;
-		mod->sml_desc = slap_schema.si_ad_createTimestamp;
-		mod->sml_bvalues = (BVarray) ch_malloc( 2 * sizeof( struct berval ) );
+		mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
+		mod->sml_bvalues = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
 		ber_dupbv( &mod->sml_bvalues[0], &timestamp );
 		mod->sml_bvalues[1].bv_val = NULL;
 		assert( mod->sml_bvalues[0].bv_val );
@@ -636,40 +676,6 @@ int slap_mods_opattrs(
 		modtail = &mod->sml_next;
 	}
 
-	mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-	mod->sml_op = mop;
-	mod->sml_type.bv_val = NULL;
-	mod->sml_desc = slap_schema.si_ad_entryCSN;
-	mod->sml_bvalues = (BVarray) ch_malloc( 2 * sizeof( struct berval ) );
-	ber_dupbv( &mod->sml_bvalues[0], &csn );
-	mod->sml_bvalues[1].bv_val = NULL;
-	assert( mod->sml_bvalues[0].bv_val );
-	*modtail = mod;
-	modtail = &mod->sml_next;
-
-	mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-	mod->sml_op = mop;
-	mod->sml_type.bv_val = NULL;
-	mod->sml_desc = slap_schema.si_ad_modifiersName;
-	mod->sml_bvalues = (BVarray) ch_malloc( 2 * sizeof( struct berval ) );
-	ber_dupbv( &mod->sml_bvalues[0], &name );
-	mod->sml_bvalues[1].bv_val = NULL;
-	assert( mod->sml_bvalues[0].bv_val );
-	*modtail = mod;
-	modtail = &mod->sml_next;
-
-	mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-	mod->sml_op = mop;
-	mod->sml_type.bv_val = NULL;
-	mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
-	mod->sml_bvalues = (BVarray) ch_malloc( 2 * sizeof( struct berval ) );
-	ber_dupbv( &mod->sml_bvalues[0], &timestamp );
-	mod->sml_bvalues[1].bv_val = NULL;
-	assert( mod->sml_bvalues[0].bv_val );
-	*modtail = mod;
-	modtail = &mod->sml_next;
-
 	*modtail = NULL;
-
 	return LDAP_SUCCESS;
 }