From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 31 May 2016 09:44:43 +0000 (+0200)
Subject: s4:dsdb/password_hash: only set pwdLastSet if required
X-Git-Tag: tdb-1.3.10~666
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cad741c7148eac6e723c6798969c89e0ec88d087;p=thirdparty%2Fsamba.git

s4:dsdb/password_hash: only set pwdLastSet if required

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

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

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 515be2621ed..f1b9b36a03c 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2251,12 +2251,14 @@ static int update_final_msg(struct setup_password_fields_io *io)
 			return ret;
 		}
 	}
-	ret = samdb_msg_add_uint64(ldb, io->ac,
-				   io->ac->update_msg,
-				   "pwdLastSet",
-				   io->g.last_set);
-	if (ret != LDB_SUCCESS) {
-		return ret;
+	if (io->ac->update_lastset) {
+		ret = samdb_msg_add_uint64(ldb, io->ac,
+					   io->ac->update_msg,
+					   "pwdLastSet",
+					   io->g.last_set);
+		if (ret != LDB_SUCCESS) {
+			return ret;
+		}
 	}
 
 	return LDB_SUCCESS;