s4:password_hash LDB module - move "samdb_msg_find_old_and_new_ldb_val" into the password_hash LDB module

It's only used there and so I think it doesn't really belong in
"dsdb/common/util.c" (I first thought that it could be useful for ACL checking
but obviously it wasn't).

1 files changed, 0 insertions, 62 deletions

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 16d5011278..04d97043b2 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -699,68 +699,6 @@ struct ldb_message_element *samdb_find_attribute(struct ldb_context *ldb,
 	return NULL;
 }
 
-/*
- * This is intended for use by the "password hash" module since there
- * password changes can be specified through one message element with the
- * new password (to set) and another one with the old password (to unset).
- *
- * The first which sets a password (new value) can have flags
- * (LDB_FLAG_MOD_ADD, LDB_FLAG_MOD_REPLACE) but also none (on "add" operations
- * for entries). The latter (old value) has always specified
- * LDB_FLAG_MOD_DELETE.
- *
- * Returns LDB_ERR_CONSTRAINT_VIOLATION and LDB_ERR_UNWILLING_TO_PERFORM if
- * matching message elements are malformed in respect to the set/change rules.
- * Otherwise it returns LDB_SUCCESS.
- */
-int samdb_msg_find_old_and_new_ldb_val(const struct ldb_message *msg,
-				       const char *name,
-				       enum ldb_request_type operation,
-				       const struct ldb_val **new_val,
-				       const struct ldb_val **old_val)
-{
-	unsigned int i;
-
-	*new_val = NULL;
-	*old_val = NULL;
-
-	if (msg == NULL) {
-		return LDB_SUCCESS;
-	}
-
-	for (i = 0; i < msg->num_elements; i++) {
-		if (ldb_attr_cmp(msg->elements[i].name, name) != 0) {
-			continue;
-		}
-
-		if ((operation == LDB_MODIFY) &&
-		    (LDB_FLAG_MOD_TYPE(msg->elements[i].flags) == LDB_FLAG_MOD_DELETE)) {
-			/* 0 values are allowed */
-			if (msg->elements[i].num_values == 1) {
-				*old_val = &msg->elements[i].values[0];
-			} else if (msg->elements[i].num_values > 1) {
-				return LDB_ERR_CONSTRAINT_VIOLATION;
-			}
-		} else if ((operation == LDB_MODIFY) &&
-			   (LDB_FLAG_MOD_TYPE(msg->elements[i].flags) == LDB_FLAG_MOD_REPLACE)) {
-			if (msg->elements[i].num_values > 0) {
-				*new_val = &msg->elements[i].values[msg->elements[i].num_values - 1];
-			} else {
-				return LDB_ERR_UNWILLING_TO_PERFORM;
-			}
-		} else {
-			/* Add operations and LDB_FLAG_MOD_ADD */
-			if (msg->elements[i].num_values > 0) {
-				*new_val = &msg->elements[i].values[msg->elements[i].num_values - 1];
-			} else {
-				return LDB_ERR_CONSTRAINT_VIOLATION;
-			}
-		}
-	}
-
-	return LDB_SUCCESS;
-}
-
 int samdb_find_or_add_value(struct ldb_context *ldb, struct ldb_message *msg, const char *name, const char *set_value)
 {
 	if (samdb_find_attribute(ldb, msg, name, set_value) == NULL) {