X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=7f4a34b0deb66b87fa385195c0cb469a013c986a;hb=f90ed5aef8f41ee90e1f67b0badbb793cb99f3ed;hp=235acc536b0aa90e72648be87495c12b742c6a60;hpb=c530ba9ceea7bbe0227e6b567392a7fe5ea75d3f;p=openldap

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 235acc536b..7f4a34b0de 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -20,33 +20,38 @@
 
 #include "slap.h"
 
-extern Backend	*select_backend();
+static void	modlist_free(LDAPModList *ml);
 
-extern char		*default_referral;
-extern time_t		currenttime;
-extern pthread_mutex_t	currenttime_mutex;
-extern int		global_lastmod;
+static int add_modified_attrs( Operation *op, LDAPModList **modlist );
 
-static void	modlist_free();
-static void	add_lastmods();
-extern char     *suffixAlias();
-
-
-void
+int
 do_modify(
     Connection	*conn,
     Operation	*op
 )
 {
-	char		*dn, *odn;
+	char		*ndn;
 	char		*last;
-	unsigned long	tag, len;
-	LDAPMod		*mods, *tmp;
-	LDAPMod		**modtail;
+	ber_tag_t	tag;
+	ber_len_t	len;
+	LDAPModList	*modlist;
+	LDAPModList	**modtail;
+#ifdef LDAP_DEBUG
+	LDAPModList *tmp;
+#endif
 	Backend		*be;
+	int rc;
 
 	Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
 
+	if( op->o_bind_in_progress ) {
+		Debug( LDAP_DEBUG_ANY, "do_modify: 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 modify request.  It looks like this:
 	 *
@@ -66,180 +71,176 @@ do_modify(
 	 *	}
 	 */
 
-	if ( ber_scanf( op->o_ber, "{a", &dn ) == LBER_ERROR ) {
-		Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "" );
-		return;
+	if ( ber_scanf( op->o_ber, "{a" /*}*/, &ndn ) == LBER_ERROR ) {
+		Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		return -1;
 	}
-	odn = strdup( dn );
-	dn_normalize( dn );
 
-	Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn, 0, 0 );
+	Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", ndn, 0, 0 );
+
+	if(	dn_normalize_case( ndn ) == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "do_modify: invalid dn (%s)\n", ndn, 0, 0 );
+		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+		    "invalid DN", NULL, NULL );
+		free( ndn );
+		return rc;
+	}
 
 	/* collect modifications & save for later */
-	mods = NULL;
-	modtail = &mods;
+	modlist = NULL;
+	modtail = &modlist;
+
 	for ( tag = ber_first_element( op->o_ber, &len, &last );
 	    tag != LBER_DEFAULT;
 	    tag = ber_next_element( op->o_ber, &len, last ) )
 	{
-		(*modtail) = (LDAPMod *) ch_calloc( 1, sizeof(LDAPMod) );
+		ber_int_t mop;
+
+		(*modtail) = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
 
-		if ( ber_scanf( op->o_ber, "{i{a[V]}}", &(*modtail)->mod_op,
-		    &(*modtail)->mod_type, &(*modtail)->mod_bvalues )
+		if ( ber_scanf( op->o_ber, "{i{a[V]}}", &mop,
+		    &(*modtail)->ml_type, &(*modtail)->ml_bvalues )
 		    == LBER_ERROR )
 		{
-			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-			    "decoding error" );
-			free( dn );
-			free( odn );
+			send_ldap_disconnect( conn, op,
+				LDAP_PROTOCOL_ERROR, "decoding modlist error" );
+			free( ndn );
 			free( *modtail );
-			modlist_free( mods );
-			return;
+			*modtail = NULL;
+			modlist_free( modlist );
+			return -1;
 		}
 
-		if ( (*modtail)->mod_op != LDAP_MOD_ADD &&
-		    (*modtail)->mod_op != LDAP_MOD_DELETE &&
-		    (*modtail)->mod_op != LDAP_MOD_REPLACE )
+		(*modtail)->ml_op = mop;
+		
+		if ( (*modtail)->ml_op != LDAP_MOD_ADD &&
+		    (*modtail)->ml_op != LDAP_MOD_DELETE &&
+		    (*modtail)->ml_op != LDAP_MOD_REPLACE )
 		{
-			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-			    "unrecognized modify operation" );
-			free( dn );
-			free( odn );
-			modlist_free( mods );
-			return;
+			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
+			    NULL, "unrecognized modify operation", NULL, NULL );
+			free( ndn );
+			modlist_free( modlist );
+			return LDAP_PROTOCOL_ERROR;
 		}
 
-		if ( (*modtail)->mod_bvalues == NULL && (*modtail)->mod_op
-		  != LDAP_MOD_DELETE ) {
-			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
-			    "no values given" );
-			free( dn );
-			free( odn );
-			modlist_free( mods );
-			return;
+		if ( (*modtail)->ml_bvalues == NULL
+			&& (*modtail)->ml_op != LDAP_MOD_DELETE )
+		{
+			send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
+			    NULL, "unrecognized modify operation", NULL, NULL );
+			free( ndn );
+			modlist_free( modlist );
+			return LDAP_PROTOCOL_ERROR;
 		}
-		attr_normalize( (*modtail)->mod_type );
+		attr_normalize( (*modtail)->ml_type );
 
-		modtail = &(*modtail)->mod_next;
+		modtail = &(*modtail)->ml_next;
 	}
 	*modtail = NULL;
 
 #ifdef LDAP_DEBUG
 	Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
-	for ( tmp = mods; tmp != NULL; tmp = tmp->mod_next ) {
-		Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n", tmp->mod_op
-		    == LDAP_MOD_ADD ? "add" : (tmp->mod_op == LDAP_MOD_DELETE ?
-		    "delete" : "replace"), tmp->mod_type, 0 );
+	for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_next ) {
+		Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n",
+			tmp->ml_op == LDAP_MOD_ADD
+				? "add" : (tmp->ml_op == LDAP_MOD_DELETE
+					? "delete" : "replace"), tmp->ml_type, 0 );
 	}
 #endif
 
+	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+		free( ndn );
+		modlist_free( modlist );
+		Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
+		return rc;
+	} 
+
 	Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MOD dn=\"%s\"\n",
-	    conn->c_connid, op->o_opid, dn, 0, 0 );
+	    op->o_connid, op->o_opid, ndn, 0, 0 );
 
 	/*
 	 * 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.
 	 */
-	if ( (be = select_backend( dn )) == NULL ) {
-		free( dn );
-		free( odn );
-		modlist_free( mods );
-		send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-		    default_referral );
-		return;
+	if ( (be = select_backend( ndn )) == NULL ) {
+		free( ndn );
+		modlist_free( modlist );
+		send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+			NULL, NULL, default_referral, NULL );
+		return rc;
 	}
 
-        /* alias suffix if approp */
-        dn = suffixAlias ( dn, op, be );
+	/* deref suffix alias if appropriate */
+	ndn = suffix_alias( be, ndn );
 
 	/*
 	 * do the modify if 1 && (2 || 3)
 	 * 1) there is a modify function implemented in this backend;
 	 * 2) this backend is master for what it holds;
-	 * 3) it's a replica and the dn supplied is the updatedn.
+	 * 3) it's a replica and the dn supplied is the update_ndn.
 	 */
-	if ( be->be_modify != NULL ) {
+	if ( be->be_modify ) {
 		/* do the update here */
-		if ( be->be_updatedn == NULL ||
-			strcasecmp( be->be_updatedn, op->o_dn ) == 0 ) {
-
-			if ( (be->be_lastmod == ON || ( be->be_lastmod == UNDEFINED &&
-				global_lastmod == ON ) ) && be->be_updatedn == NULL ) {
-				add_lastmods( op, &mods );
+		if ( be->be_update_ndn == NULL ||
+			strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
+		{
+			if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
+				global_lastmod == ON)) && be->be_update_ndn == NULL )
+			{
+				rc = add_modified_attrs( op, &modlist );
+
+				if( rc != LDAP_SUCCESS ) {
+					free( ndn );
+					modlist_free( modlist );
+					send_ldap_result( conn, op, rc,
+						NULL, "no-user-modification attribute type",
+						NULL, NULL );
+					return rc;
+				}
 			}
-			if ( (*be->be_modify)( be, conn, op, odn, mods ) == 0 ) {
-				replog( be, LDAP_REQ_MODIFY, dn, mods, 0 );
+
+			if ( (*be->be_modify)( be, conn, op, ndn, modlist ) == 0 ) {
+				replog( be, op, ndn, modlist );
 			}
 
 		/* send a referral */
 		} else {
-			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 );
 		}
 	} else {
-		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-		    "Function not implemented" );
+		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+		    NULL, "Function not implemented", NULL, NULL );
 	}
 
-	free( dn );
-	free( odn );
-	modlist_free( mods );
+	free( ndn );
+	modlist_free( modlist );
+	return rc;
 }
 
-static void
-modlist_free(
-    LDAPMod	*mods
-)
-{
-	LDAPMod	*next;
-
-	for ( ; mods != NULL; mods = next ) {
-		next = mods->mod_next;
-		free( mods->mod_type );
-		if ( mods->mod_bvalues != NULL )
-			ber_bvecfree( mods->mod_bvalues );
-		free( mods );
-	}
-}
-
-static void
-add_lastmods( Operation *op, LDAPMod **mods )
+static int
+add_modified_attrs( Operation *op, LDAPModList **modlist )
 {
 	char		buf[22];
 	struct berval	bv;
 	struct berval	*bvals[2];
-	LDAPMod		**m;
-	LDAPMod		*tmp;
+	LDAPModList		*m;
 	struct tm	*ltm;
-
-	Debug( LDAP_DEBUG_TRACE, "add_lastmods\n", 0, 0, 0 );
+	time_t		currenttime;
 
 	bvals[0] = &bv;
 	bvals[1] = NULL;
 
 	/* remove any attempts by the user to modify these attrs */
-	for ( m = mods; *m != NULL; m = &(*m)->mod_next ) {
-            if ( strcasecmp( (*m)->mod_type, "modifytimestamp" ) == 0 || 
-				strcasecmp( (*m)->mod_type, "modifiersname" ) == 0 ||
-				strcasecmp( (*m)->mod_type, "createtimestamp" ) == 0 || 
-				strcasecmp( (*m)->mod_type, "creatorsname" ) == 0 ) {
-
-                Debug( LDAP_DEBUG_TRACE,
-					"add_lastmods: found lastmod attr: %s\n",
-					(*m)->mod_type, 0, 0 );
-                tmp = *m;
-                *m = (*m)->mod_next;
-                free( tmp->mod_type );
-                if ( tmp->mod_bvalues != NULL ) {
-                    ber_bvecfree( tmp->mod_bvalues );
-                }
-                free( tmp );
-                if (!*m)
-                    break;
-            }
-        }
+	for ( m = *modlist; m != NULL; m = m->ml_next ) {
+		if ( oc_check_no_usermod_attr( m->ml_type ) ) {
+			return LDAP_CONSTRAINT_VIOLATION;
+		}
+	}
 
 	if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
 		bv.bv_val = "NULLDN";
@@ -248,16 +249,16 @@ add_lastmods( Operation *op, LDAPMod **mods )
 		bv.bv_val = op->o_dn;
 		bv.bv_len = strlen( bv.bv_val );
 	}
-	tmp = (LDAPMod *) ch_calloc( 1, sizeof(LDAPMod) );
-	tmp->mod_type = strdup( "modifiersname" );
-	tmp->mod_op = LDAP_MOD_REPLACE;
-	tmp->mod_bvalues = (struct berval **) ch_calloc( 1,
-	    2 * sizeof(struct berval *) );
-	tmp->mod_bvalues[0] = ber_bvdup( &bv );
-	tmp->mod_next = *mods;
-	*mods = tmp;
-
-	pthread_mutex_lock( &currenttime_mutex );
+	m = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
+	m->ml_type = ch_strdup( "modifiersname" );
+	m->ml_op = LDAP_MOD_REPLACE;
+	m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
+	m->ml_bvalues[0] = ber_bvdup( &bv );
+	m->ml_next = *modlist;
+	*modlist = m;
+
+	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 );
@@ -265,14 +266,35 @@ add_lastmods( Operation *op, LDAPMod **mods )
 	ltm = localtime( &currenttime );
 	strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
 #endif
-	pthread_mutex_unlock( &currenttime_mutex );
+	ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+
 	bv.bv_val = buf;
 	bv.bv_len = strlen( bv.bv_val );
-	tmp = (LDAPMod *) ch_calloc( 1, sizeof(LDAPMod) );
-	tmp->mod_type = strdup( "modifytimestamp" );
-	tmp->mod_op = LDAP_MOD_REPLACE;
-	tmp->mod_bvalues = (struct berval **) ch_calloc( 1, 2 * sizeof(struct berval *) );
-	tmp->mod_bvalues[0] = ber_bvdup( &bv );
-	tmp->mod_next = *mods;
-	*mods = tmp;
+	m = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
+	m->ml_type = ch_strdup( "modifytimestamp" );
+	m->ml_op = LDAP_MOD_REPLACE;
+	m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
+	m->ml_bvalues[0] = ber_bvdup( &bv );
+	m->ml_next = *modlist;
+	*modlist = m;
+
+	return LDAP_SUCCESS;
+}
+
+static void
+modlist_free(
+    LDAPModList	*ml
+)
+{
+	LDAPModList *next;
+
+	for ( ; ml != NULL; ml = next ) {
+		next = ml->ml_next;
+
+		free( ml->ml_type );
+		if ( ml->ml_bvalues != NULL )
+			ber_bvecfree( ml->ml_bvalues );
+
+		free( ml );
+	}
 }