CVE-2020-25722 s4/dsdb/samldb: samldb_pwd_last_set_change() checks all 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 1410e5bc5e6cd488886f0142bb2ae2cada69f0c7..8e93df221f5318dde4de7c0e8fd2b0a4828c349e 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -3102,8 +3102,15 @@ static int samldb_pwd_last_set_change(struct samldb_ctx *ac)
                NULL
        };
 
-       el = dsdb_get_single_valued_attr(ac->msg, "pwdLastSet",
-                                        ac->req->operation);
+       ret = dsdb_get_expected_new_values(ac,
+                                          ac->msg,
+                                          "pwdLastSet",
+                                          &el,
+                                          ac->req->operation);
+       if (ret != LDB_SUCCESS) {
+               return ret;
+       }
+
        if (el == NULL || el->num_values == 0) {
                ldb_asprintf_errstring(ldb,
                        "%08X: samldb: 'pwdLastSet' can't be deleted!",