CVE-2020-25722 s4/dsdb/samldb: samldb_sam_accountname_valid_check() check all values

Using dsdb_get_expected_new_values().

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14876

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 4bd40a5ef1f51853d65b521ee66354775e61a23f..5d3e0f9771c28ba45c9835d0e5067d4331ab78dc 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -530,8 +530,17 @@ static int samldb_sam_accountname_valid_check(struct samldb_ctx *ac)
        bool is_admin;
        struct security_token *user_token = NULL;
        struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
-       struct ldb_message_element *el = dsdb_get_single_valued_attr(ac->msg, "samAccountName",
-                                        ac->req->operation);
+       struct ldb_message_element *el = NULL;
+
+       ret = dsdb_get_expected_new_values(ac,
+                                          ac->msg,
+                                          "samAccountName",
+                                          &el,
+                                          ac->req->operation);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
        if (el == NULL || el->num_values == 0) {
                ldb_asprintf_errstring(ldb,
                        "%08X: samldb: 'samAccountName' can't be deleted/empty!",