s3-account_policy: add pdb_policy_type enum.

Guenther

2 files changed, 32 insertions, 32 deletions

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 10852514212..b27603f2615 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -639,9 +639,9 @@ NTSTATUS _samr_GetUserPwInfo(pipes_struct *p,
 	switch (sid_type) {
 		case SID_NAME_USER:
 			become_root();
-			pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
+			pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN,
 					       &min_password_length);
-			pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+			pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
 					       &password_properties);
 			unbecome_root();
 
@@ -2079,19 +2079,19 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
 
 		/* AS ROOT !!! */
 
-		pdb_get_account_policy(AP_MIN_PASSWORD_LEN, &tmp);
+		pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN, &tmp);
 		dominfo->min_password_length = tmp;
 
-		pdb_get_account_policy(AP_PASSWORD_HISTORY, &tmp);
+		pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &tmp);
 		dominfo->password_history_length = tmp;
 
-		pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+		pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
 				       &dominfo->password_properties);
 
-		pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &account_policy_temp);
+		pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &account_policy_temp);
 		u_expire = account_policy_temp;
 
-		pdb_get_account_policy(AP_MIN_PASSWORD_AGE, &account_policy_temp);
+		pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, &account_policy_temp);
 		u_min_age = account_policy_temp;
 
 		/* !AS ROOT */
@@ -3305,19 +3305,19 @@ static NTSTATUS query_dom_info_1(TALLOC_CTX *mem_ctx,
 
 	/* AS ROOT !!! */
 
-	pdb_get_account_policy(AP_MIN_PASSWORD_LEN, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN, &account_policy_temp);
 	r->min_password_length = account_policy_temp;
 
-	pdb_get_account_policy(AP_PASSWORD_HISTORY, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &account_policy_temp);
 	r->password_history_length = account_policy_temp;
 
-	pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+	pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
 			       &r->password_properties);
 
-	pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &account_policy_temp);
 	u_expire = account_policy_temp;
 
-	pdb_get_account_policy(AP_MIN_PASSWORD_AGE, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, &account_policy_temp);
 	u_min_age = account_policy_temp;
 
 	/* !AS ROOT */
@@ -3352,7 +3352,7 @@ static NTSTATUS query_dom_info_2(TALLOC_CTX *mem_ctx,
 	r->num_groups	= count_sam_groups(dinfo->disp_info);
 	r->num_aliases	= count_sam_aliases(dinfo->disp_info);
 
-	pdb_get_account_policy(AP_TIME_TO_LOGOUT, &u_logout);
+	pdb_get_account_policy(PDB_POLICY_TIME_TO_LOGOUT, &u_logout);
 
 	unix_to_nt_time_abs(&r->force_logoff_time, u_logout);
 
@@ -3389,7 +3389,7 @@ static NTSTATUS query_dom_info_3(TALLOC_CTX *mem_ctx,
 
 	{
 		uint32_t ul;
-		pdb_get_account_policy(AP_TIME_TO_LOGOUT, &ul);
+		pdb_get_account_policy(PDB_POLICY_TIME_TO_LOGOUT, &ul);
 		u_logout = (time_t)ul;
 	}
 
@@ -3506,16 +3506,16 @@ static NTSTATUS query_dom_info_11(TALLOC_CTX *mem_ctx,
 
 	become_root();
 
-	pdb_get_account_policy(AP_LOCK_ACCOUNT_DURATION, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_LOCK_ACCOUNT_DURATION, &account_policy_temp);
 	u_lock_duration = account_policy_temp;
 	if (u_lock_duration != -1) {
 		u_lock_duration *= 60;
 	}
 
-	pdb_get_account_policy(AP_RESET_COUNT_TIME, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_RESET_COUNT_TIME, &account_policy_temp);
 	u_reset_time = account_policy_temp * 60;
 
-	pdb_get_account_policy(AP_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
 	r->lockout_threshold = account_policy_temp;
 
 	/* !AS ROOT */
@@ -3541,16 +3541,16 @@ static NTSTATUS query_dom_info_12(TALLOC_CTX *mem_ctx,
 
 	/* AS ROOT !!! */
 
-	pdb_get_account_policy(AP_LOCK_ACCOUNT_DURATION, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_LOCK_ACCOUNT_DURATION, &account_policy_temp);
 	u_lock_duration = account_policy_temp;
 	if (u_lock_duration != -1) {
 		u_lock_duration *= 60;
 	}
 
-	pdb_get_account_policy(AP_RESET_COUNT_TIME, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_RESET_COUNT_TIME, &account_policy_temp);
 	u_reset_time = account_policy_temp * 60;
 
-	pdb_get_account_policy(AP_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
+	pdb_get_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
 	r->lockout_threshold = account_policy_temp;
 
 	/* !AS ROOT */
@@ -6205,9 +6205,9 @@ NTSTATUS _samr_GetDomPwInfo(pipes_struct *p,
 	}
 
 	become_root();
-	pdb_get_account_policy(AP_MIN_PASSWORD_LEN,
+	pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_LEN,
 			       &min_password_length);
-	pdb_get_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+	pdb_get_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
 			       &password_properties);
 	unbecome_root();
 
@@ -6376,14 +6376,14 @@ static NTSTATUS set_dom_info_1(TALLOC_CTX *mem_ctx,
 	u_expire = nt_time_to_unix_abs((NTTIME *)&r->max_password_age);
 	u_min_age = nt_time_to_unix_abs((NTTIME *)&r->min_password_age);
 
-	pdb_set_account_policy(AP_MIN_PASSWORD_LEN,
+	pdb_set_account_policy(PDB_POLICY_MIN_PASSWORD_LEN,
 			       (uint32_t)r->min_password_length);
-	pdb_set_account_policy(AP_PASSWORD_HISTORY,
+	pdb_set_account_policy(PDB_POLICY_PASSWORD_HISTORY,
 			       (uint32_t)r->password_history_length);
-	pdb_set_account_policy(AP_USER_MUST_LOGON_TO_CHG_PASS,
+	pdb_set_account_policy(PDB_POLICY_USER_MUST_LOGON_TO_CHG_PASS,
 			       (uint32_t)r->password_properties);
-	pdb_set_account_policy(AP_MAX_PASSWORD_AGE, (int)u_expire);
-	pdb_set_account_policy(AP_MIN_PASSWORD_AGE, (int)u_min_age);
+	pdb_set_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, (int)u_expire);
+	pdb_set_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, (int)u_min_age);
 
 	return NT_STATUS_OK;
 }
@@ -6398,7 +6398,7 @@ static NTSTATUS set_dom_info_3(TALLOC_CTX *mem_ctx,
 
 	u_logout = nt_time_to_unix_abs((NTTIME *)&r->force_logoff_time);
 
-	pdb_set_account_policy(AP_TIME_TO_LOGOUT, (int)u_logout);
+	pdb_set_account_policy(PDB_POLICY_TIME_TO_LOGOUT, (int)u_logout);
 
 	return NT_STATUS_OK;
 }
@@ -6418,9 +6418,9 @@ static NTSTATUS set_dom_info_12(TALLOC_CTX *mem_ctx,
 
 	u_reset_time = nt_time_to_unix_abs((NTTIME *)&r->lockout_window)/60;
 
-	pdb_set_account_policy(AP_LOCK_ACCOUNT_DURATION, (int)u_lock_duration);
-	pdb_set_account_policy(AP_RESET_COUNT_TIME, (int)u_reset_time);
-	pdb_set_account_policy(AP_BAD_ATTEMPT_LOCKOUT,
+	pdb_set_account_policy(PDB_POLICY_LOCK_ACCOUNT_DURATION, (int)u_lock_duration);
+	pdb_set_account_policy(PDB_POLICY_RESET_COUNT_TIME, (int)u_reset_time);
+	pdb_set_account_policy(PDB_POLICY_BAD_ATTEMPT_LOCKOUT,
 			       (uint32_t)r->lockout_threshold);
 
 	return NT_STATUS_OK;
diff --git a/source3/rpc_server/srv_samr_util.c b/source3/rpc_server/srv_samr_util.c
index 69daa31e9c1..1e5988af330 100644
--- a/source3/rpc_server/srv_samr_util.c
+++ b/source3/rpc_server/srv_samr_util.c
@@ -619,7 +619,7 @@ void copy_id21_to_sam_passwd(const char *log_prefix,
 			uint32_t pwd_max_age = 0;
 			time_t now = time(NULL);
 
-			pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &pwd_max_age);
+			pdb_get_account_policy(PDB_POLICY_MAX_PASSWORD_AGE, &pwd_max_age);
 
 			if (pwd_max_age == (uint32_t)-1 || pwd_max_age == 0) {
 				pwd_max_age = get_time_t_max();