sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-13 08:23:49 +03:00
Code Activity

r18722: Fix up password change times. The can change and must change times are

Browse Source 
calculated based on the last change time, policies, and acb flags.

Next step will be to not bother storing them.  Right now I'm just trying to
get them reported correctly.
This commit is contained in:
Jim McDonough
2006-09-20 17:25:46 +00:00
committed by Gerald (Jerry) Carter
parent 867eeaafce
commit fd5761c9e5
3 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
source/rpc_server/srv_samr_util.c
View File

@@ -283,26 +283,16 @@ void copy_id21_to_sam_passwd(struct samu *to, SAM_USER_INFO_21 *from)
}
}
DEBUG(10,("INFO_21 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
if (from->passmustchange==PASS_MUST_CHANGE_AT_NEXT_LOGON) {
pdb_set_pass_must_change_time(to,0, PDB_CHANGED);
} else {
uint32 expire;
time_t new_time;
if (pdb_get_pass_must_change_time(to) == 0) {
if (!pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &expire)
|| expire == (uint32)-1) {
new_time = get_time_t_max();
} else {
time_t old_time = pdb_get_pass_last_set_time(to);
new_time = old_time + expire;
if ((new_time) < time(0)) {
new_time = time(0) + expire;
}
}
if (!pdb_set_pass_must_change_time (to, new_time, PDB_CHANGED)) {
DEBUG (0, ("pdb_set_pass_must_change_time failed!\n"));
}
/* If the must change flag is set, the last set time goes to zero.
the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_21 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
pdb_set_pass_last_set_time(to, time(0), PDB_CHANGED);
}
}
@@ -522,26 +512,16 @@ void copy_id23_to_sam_passwd(struct samu *to, SAM_USER_INFO_23 *from)
}
}
DEBUG(10,("INFO_23 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
if (from->passmustchange==PASS_MUST_CHANGE_AT_NEXT_LOGON) {
pdb_set_pass_must_change_time(to,0, PDB_CHANGED);
} else {
uint32 expire;
time_t new_time;
if (pdb_get_pass_must_change_time(to) == 0) {
if (!pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &expire)
|| expire == (uint32)-1) {
new_time = get_time_t_max();
} else {
time_t old_time = pdb_get_pass_last_set_time(to);
new_time = old_time + expire;
if ((new_time) < time(0)) {
new_time = time(0) + expire;
}
}
if (!pdb_set_pass_must_change_time (to, new_time, PDB_CHANGED)) {
DEBUG (0, ("pdb_set_pass_must_change_time failed!\n"));
}
/* If the must change flag is set, the last set time goes to zero.
the must change and can change fields also do, but they are
calculated from policy, not set from the wire */
if (from->fields_present & ACCT_EXPIRED_FLAG) {
DEBUG(10,("INFO_23 PASS_MUST_CHANGE_AT_NEXT_LOGON: %02X\n",from->passmustchange));
if (from->passmustchange == PASS_MUST_CHANGE_AT_NEXT_LOGON) {
pdb_set_pass_last_set_time(to, 0, PDB_CHANGED);
} else {
pdb_set_pass_last_set_time(to, time(0), PDB_CHANGED);
}
}