53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From fdd25972d26455c1b1254de3d1697786ae0678a3 Mon Sep 17 00:00:00 2001
|
|
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
|
|
Date: Wed, 20 Oct 2021 17:18:10 +1300
|
|
Subject: [PATCH 168/266] CVE-2020-25722 s4/dsdb/samldb:
|
|
samldb_service_principal_names_change checks 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/fdd25972d26455c1b1254de3d1697786ae0678a3
|
|
|
|
---
|
|
source4/dsdb/samdb/ldb_modules/samldb.c | 20 ++++++++++++++++----
|
|
1 file changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
index 391437d759d..80ca1e3afc0 100644
|
|
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
|
|
@@ -4047,10 +4047,22 @@ static int samldb_service_principal_names_change(struct samldb_ctx *ac)
|
|
unsigned int i, j;
|
|
int ret;
|
|
|
|
- el = dsdb_get_single_valued_attr(ac->msg, "dNSHostName",
|
|
- ac->req->operation);
|
|
- el2 = dsdb_get_single_valued_attr(ac->msg, "sAMAccountName",
|
|
- ac->req->operation);
|
|
+ ret = dsdb_get_expected_new_values(ac,
|
|
+ ac->msg,
|
|
+ "dNSHostName",
|
|
+ &el,
|
|
+ ac->req->operation);
|
|
+ if (ret != LDB_SUCCESS) {
|
|
+ return ret;
|
|
+ }
|
|
+ ret = dsdb_get_expected_new_values(ac,
|
|
+ ac->msg,
|
|
+ "sAMAccountName",
|
|
+ &el2,
|
|
+ ac->req->operation);
|
|
+ if (ret != LDB_SUCCESS) {
|
|
+ return ret;
|
|
+ }
|
|
if ((el == NULL) && (el2 == NULL)) {
|
|
/* we are not affected */
|
|
return LDB_SUCCESS;
|
|
--
|
|
2.23.0
|
|
|