From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Wed, 15 Apr 2026 10:57:40 +0000 (+0100)
Subject: ITS#6825 slapd: add modify_entry helper
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=985d420da8043f0f7fe4305405b678c067f2b141;p=thirdparty%2Fopenldap.git

ITS#6825 slapd: add modify_entry helper
---

diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index 1d492b1fca..7248da8400 100644
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -402,7 +402,7 @@ modify_increment_values(
 
 			modReplace.sm_op = LDAP_MOD_REPLACE;
 
-			return modify_add_values(e, &modReplace, permissive, text, textbuf, textlen);
+			return modify_add_values( e, &modReplace, permissive, text, textbuf, textlen);
 		} else {
 			*text = textbuf;
 			snprintf( textbuf, textlen,
@@ -464,6 +464,96 @@ modify_increment_values(
 	return LDAP_SUCCESS;
 }
 
+int
+modify_entry(
+	Operation *op,
+	Entry *entry,
+	Modifications *modlist,
+	int permissive,
+	int schema_check,
+	const char	**text,
+	char *textbuf, size_t textlen )
+{
+	int rc = modlist ? LDAP_UNWILLING_TO_PERFORM : LDAP_SUCCESS;
+	int is_oc = 0;
+	Modification *mods;
+
+	for ( ; modlist != NULL; modlist = modlist->sml_next ) {
+		mods = &modlist->sml_mod;
+
+		if ( mods->sm_desc == slap_schema.si_ad_objectClass ) {
+			is_oc = 1;
+		}
+		switch ( mods->sm_op ) {
+		case LDAP_MOD_ADD:
+			rc = modify_add_values( entry, mods,
+					permissive, text, textbuf, textlen );
+			break;
+
+		case LDAP_MOD_DELETE:
+			rc = modify_delete_values( entry, mods,
+					permissive, text, textbuf, textlen );
+			break;
+
+		case LDAP_MOD_REPLACE:
+			rc = modify_replace_values( entry, mods,
+					permissive, text, textbuf, textlen );
+			break;
+
+		case LDAP_MOD_INCREMENT:
+			rc = modify_increment_values( entry, mods,
+					permissive, text, textbuf, textlen );
+			break;
+
+		case SLAP_MOD_SOFTADD:
+			mods->sm_op = LDAP_MOD_ADD;
+			rc = modify_add_values( entry, mods,
+					permissive, text, textbuf, textlen );
+			mods->sm_op = SLAP_MOD_SOFTADD;
+			if ( rc == LDAP_TYPE_OR_VALUE_EXISTS ) {
+				rc = LDAP_SUCCESS;
+			}
+			break;
+
+		case SLAP_MOD_SOFTDEL:
+			mods->sm_op = LDAP_MOD_DELETE;
+			rc = modify_delete_values( entry, mods,
+					permissive, text, textbuf, textlen );
+			mods->sm_op = SLAP_MOD_SOFTDEL;
+			if ( rc == LDAP_NO_SUCH_ATTRIBUTE ) {
+				rc = LDAP_SUCCESS;
+			}
+			break;
+
+		case SLAP_MOD_ADD_IF_NOT_PRESENT:
+			if ( attr_find( entry->e_attrs, mods->sm_desc ) ) {
+				rc = LDAP_SUCCESS;
+				break;
+			}
+			mods->sm_op = LDAP_MOD_ADD;
+			rc = modify_add_values( entry, mods,
+					permissive, text, textbuf, textlen );
+			mods->sm_op = SLAP_MOD_ADD_IF_NOT_PRESENT;
+			break;
+		}
+		if ( rc != LDAP_SUCCESS ) break;
+	}
+
+	if ( rc == LDAP_SUCCESS ) {
+		*text = NULL; /* Needed at least with SLAP_MOD_SOFT* ops */
+		if ( is_oc ) {
+			entry->e_ocflags = 0;
+		}
+		if ( schema_check ) {
+			/* check that the entry still obeys the schema */
+			rc = entry_schema_check( op, entry, 0, 0, NULL,
+					text, textbuf, textlen );
+		}
+	}
+
+	return rc;
+}
+
 void
 slap_mod_free(
 	Modification	*mod,
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index b2f2d9bb89..e01fd4f3c0 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1366,6 +1366,10 @@ LDAP_SLAPD_F( int ) modify_increment_values( Entry *e,
 	Modification *mod,
 	int permissive,
 	const char **text, char *textbuf, size_t textlen );
+LDAP_SLAPD_F( int ) modify_entry( Operation *op, Entry *e,
+	Modifications *mods,
+	int permissive, int schema_check,
+	const char **text, char *textbuf, size_t textlen );
 
 LDAP_SLAPD_F( void ) slap_mod_free( Modification *mod, int freeit );
 LDAP_SLAPD_F( void ) slap_mods_free( Modifications *mods, int freevals );