selftest: Cope with LM hash not being stored in the tombstone_reanimation test

The removal of LM hash storage changes the expected metadata.

We do not need to track these values exactly to prove the
behaviour here.

This is not due to the changes in password_hash directly, which in
update_final_msg() sets DSDB_FLAG_INTERNAL_FORCE_META_DATA to force
a push out of the removed attribute to the replication state.

However at the stage of a subsequent LDAP Delete there is no longer
a lmPwdHistory nor dBCSPwd attribute, in the directory, so there is
no subsequent version bump to remove them when building a tombstone.

Samba's behaviour is different to that seen by Metze on windows 2022,
where he sees dBCSPwd removed (for the no LM store case) but
lmPwdHistory kept.  We in Samba choose to differ, not storing an
ambiguous LM hsitory (of "" values likely), so allowing any version
for these two attributes is the sensible choice.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/knownfail.d/lm-hash-support-gone b/selftest/knownfail.d/lm-hash-support-gone
index 68d2c41de9bec3c9936428c6406d78b3993fd7cb..0afd5960a0c329e3499c3c72d77d3c7b4f34061b 100644 (file)
--- a/selftest/knownfail.d/lm-hash-support-gone
+++ b/selftest/knownfail.d/lm-hash-support-gone
@@ -5,6 +5,5 @@
 ^samba.tests.ntlm_auth.samba.tests.ntlm_auth.NTLMAuthHelpersTests.test_diagnostics\(ad_member:local\)
 ^samba.tests.ntlm_auth.samba.tests.ntlm_auth.NTLMAuthHelpersTests.test_diagnostics\(chgdcpass:local\)
 ^samba.tests.ntlm_auth.samba.tests.ntlm_auth.NTLMAuthHelpersTests.test_diagnostics\(rodc:local\)
-^samba4.tombstone_reanimation.python.tombstone_reanimation.RestoreUserPwdObjectTestCase.test_restorepw_user
 ^samba4.rpc.samlogon on ncacn_np with .samlogon\(ad_dc_slowtests\)
 ^samba.tests.auth_log_pass_change.samba.tests.auth_log_pass_change.AuthLogPassChangeTests.test_rap_change_password\(ad_dc_smb1\)

diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py
index 453e378332b42d1cbe4202f088c7cc9c586f26f0..ce3555af3bffe3d48c568557b87480d5a2efabed 100755 (executable)
--- a/source4/dsdb/tests/python/tombstone_reanimation.py
+++ b/source4/dsdb/tests/python/tombstone_reanimation.py
@@ -663,7 +663,7 @@ class RestoreUserPwdObjectTestCase(RestoredObjectAttributesBaseTestCase):
             (DRSUAPI_ATTID_supplementalCredentials, 2),
             (DRSUAPI_ATTID_objectSid, 1),
             (DRSUAPI_ATTID_accountExpires, 2),
-            (DRSUAPI_ATTID_lmPwdHistory, 2),
+            (DRSUAPI_ATTID_lmPwdHistory, None),
             (DRSUAPI_ATTID_sAMAccountName, 1),
             (DRSUAPI_ATTID_sAMAccountType, 2),
             (DRSUAPI_ATTID_lastKnownParent, 1),
@@ -725,7 +725,7 @@ class RestoreUserPwdObjectTestCase(RestoredObjectAttributesBaseTestCase):
             (DRSUAPI_ATTID_objectSid, 1),
             (DRSUAPI_ATTID_adminCount, 1),
             (DRSUAPI_ATTID_accountExpires, 3),
-            (DRSUAPI_ATTID_lmPwdHistory, 3),
+            (DRSUAPI_ATTID_lmPwdHistory, None),
             (DRSUAPI_ATTID_sAMAccountName, 1),
             (DRSUAPI_ATTID_sAMAccountType, 3),
             (DRSUAPI_ATTID_lastKnownParent, 1),