More use of intermediate variables to avoid issues with pointer size and casts.

Andrew Bartlett
(This used to be commit 88b68f79721b5fea7ddcad5a83b9555528c75c20)

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 96960611b7fbe2e8e44c0ee11178fc175a02e4c9..eb74acf35be34584e432ec39ce87d41f6c32ab40 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -4197,6 +4197,8 @@ NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOW
 
        uint32 num_users=0, num_groups=0, num_aliases=0;
 
+       uint32 account_policy_temp;
+
        if ((ctr = (SAM_UNK_CTR *)talloc_zero(p->mem_ctx, sizeof(SAM_UNK_CTR))) == NULL)
                return NT_STATUS_NO_MEMORY;
 
@@ -4212,11 +4214,20 @@ NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOW
 
        switch (q_u->switch_value) {
                case 0x01:
-                       account_policy_get(AP_MIN_PASSWORD_LEN, &min_pass_len);
-                       account_policy_get(AP_PASSWORD_HISTORY, &pass_hist);
-                       account_policy_get(AP_USER_MUST_LOGON_TO_CHG_PASS, &flag);
-                       account_policy_get(AP_MAX_PASSWORD_AGE, (int *)&u_expire);
-                       account_policy_get(AP_MIN_PASSWORD_AGE, (int *)&u_min_age);
+                       account_policy_get(AP_MIN_PASSWORD_LEN, &account_policy_temp);
+                       min_pass_len = account_policy_temp;
+
+                       account_policy_get(AP_PASSWORD_HISTORY, &account_policy_temp);
+                       pass_hist = account_policy_temp;
+
+                       account_policy_get(AP_USER_MUST_LOGON_TO_CHG_PASS, &account_policy_temp);
+                       flag = account_policy_temp;
+
+                       account_policy_get(AP_MAX_PASSWORD_AGE, &account_policy_temp);
+                       u_expire = account_policy_temp;
+
+                       account_policy_get(AP_MIN_PASSWORD_AGE, &account_policy_temp);
+                       u_min_age = account_policy_temp;
 
                        unix_to_nt_time_abs(&nt_expire, u_expire);
                        unix_to_nt_time_abs(&nt_min_age, u_min_age);
@@ -4248,7 +4259,9 @@ NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOW
                                       num_users, num_groups, num_aliases);
                        break;
                case 0x03:
-                       account_policy_get(AP_TIME_TO_LOGOUT, (int *)&u_logout);
+                       account_policy_get(AP_TIME_TO_LOGOUT, &account_policy_temp);
+                       u_logout = account_policy_temp;
+
                        unix_to_nt_time_abs(&nt_logout, u_logout);
                        
                        init_unk_info3(&ctr->info.inf3, nt_logout);
@@ -4263,9 +4276,14 @@ NTSTATUS _samr_unknown_2e(pipes_struct *p, SAMR_Q_UNKNOWN_2E *q_u, SAMR_R_UNKNOW
                        init_unk_info7(&ctr->info.inf7);
                        break;
                case 0x0c:
-                       account_policy_get(AP_LOCK_ACCOUNT_DURATION, (int *)&u_lock_duration);
-                       account_policy_get(AP_RESET_COUNT_TIME, (int *)&u_reset_time);
-                       account_policy_get(AP_BAD_ATTEMPT_LOCKOUT, &lockout);
+                       account_policy_get(AP_LOCK_ACCOUNT_DURATION, &account_policy_temp);
+                       u_lock_duration = account_policy_temp;
+
+                       account_policy_get(AP_RESET_COUNT_TIME, &account_policy_temp);
+                       u_reset_time = account_policy_temp;
+
+                       account_policy_get(AP_BAD_ATTEMPT_LOCKOUT, &account_policy_temp);
+                       lockout = account_policy_temp;
        
                        unix_to_nt_time_abs(&nt_lock_duration, u_lock_duration);
                        unix_to_nt_time_abs(&nt_reset_time, u_reset_time);