s4-dsdb: Move User object default attribute values in separate helper

Change-Id: I1e291bcf0a5c9b2fca11323dc7f8be29f5145d42
Signed-off-by: Kamen Mazdrashki <kamenim@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

3 files changed, 46 insertions, 52 deletions

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 6c05b5081a4..35d7b65b372 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -4844,3 +4844,45 @@ NTSTATUS dsdb_update_bad_pwd_count(TALLOC_CTX *mem_ctx,
 	*_mod_msg = mod_msg;
 	return NT_STATUS_OK;
 }
+
+/**
+ * Sets defaults for a User object
+ * List of default attributes set:
+ * 	accountExpires, badPasswordTime, badPwdCount,
+ * 	codePage, countryCode, lastLogoff, lastLogon
+ * 	logonCount, pwdLastSet
+ */
+int dsdb_user_obj_set_defaults(struct ldb_context *ldb, struct ldb_message *usr_obj)
+{
+	int ret;
+
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"accountExpires", "9223372036854775807");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"badPasswordTime", "0");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"badPwdCount", "0");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"codePage", "0");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"countryCode", "0");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"lastLogoff", "0");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"lastLogon", "0");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"logonCount", "0");
+	if (ret != LDB_SUCCESS) return ret;
+	ret = samdb_find_or_add_attribute(ldb, usr_obj,
+		"pwdLastSet", "0");
+	if (ret != LDB_SUCCESS) return ret;
+
+	return LDB_SUCCESS;
+}
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 8b23383bf4b..4681decdc16 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -999,32 +999,7 @@ static int samldb_objectclass_trigger(struct samldb_ctx *ac)
 		bool uac_generated = false, uac_add_flags = false;
 
 		/* Step 1.2: Default values */
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"accountExpires", "9223372036854775807");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"badPasswordTime", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"badPwdCount", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"codePage", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"countryCode", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"lastLogoff", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"lastLogon", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"logonCount", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, ac->msg,
-			"pwdLastSet", "0");
+		ret = dsdb_user_obj_set_defaults(ldb, ac->msg);
 		if (ret != LDB_SUCCESS) return ret;
 
 		/* On add operations we might need to generate a
diff --git a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
index 8b3157917ad..298567eafb2 100644
--- a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
+++ b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
@@ -238,33 +238,10 @@ static int _tr_restore_attributes(struct ldb_context *ldb, struct ldb_message *c
 		/* restoring 'user' instance attribute is heavily borrowed from samldb.c */
 
 		/* Default values */
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "accountExpires", "9223372036854775807");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "badPasswordTime", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "badPwdCount", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "codePage", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "countryCode", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "lastLogoff", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "lastLogon", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "logonCount", "0");
-		if (ret != LDB_SUCCESS) return ret;
-		ret = samdb_find_or_add_attribute(ldb, new_msg,
-						  "pwdLastSet", "0");
+		ret = dsdb_user_obj_set_defaults(ldb, new_msg);
 		if (ret != LDB_SUCCESS) return ret;
+
+		/* Following are set only while reanimating objects */
 		ret = samdb_find_or_add_attribute(ldb, new_msg,
 						  "adminCount", "0");
 		if (ret != LDB_SUCCESS) return ret;