48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 437465a90eff051762f347cb5537107f2234af01 Mon Sep 17 00:00:00 2001
|
|
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Date: Fri, 22 Oct 2021 14:52:49 +1300
|
|
Subject: [PATCH 159/266] 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>
|
|
|
|
Conflict:NA
|
|
Reference:https://gitlab.com/samba-team/samba/-/commit/437465a90eff051762f347cb5537107f2234af01
|
|
|
|
---
|
|
source4/dsdb/samdb/ldb_modules/samldb.c | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
index 4bd40a5ef1f..5d3e0f9771c 100644
|
|
--- 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!",
|
|
--
|
|
2.23.0
|
|
|