diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/pdb_samba4.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/passdb/pdb_samba4.c b/source3/passdb/pdb_samba4.c index 8da9b3cf5a..f336b8a9c6 100644 --- a/source3/passdb/pdb_samba4.c +++ b/source3/passdb/pdb_samba4.c @@ -357,6 +357,15 @@ static int pdb_samba4_replace_by_sam(struct pdb_samba4_state *state, return ret; } + /* If we set a plaintext password, the system will + * force the pwdLastSet to now() */ + if (need_update(sam, PDB_PASSLASTSET)) { + dsdb_flags = DSDB_PASSWORD_BYPASS_LAST_SET; + + ret |= pdb_samba4_add_time(msg, "pwdLastSet", + pdb_get_pass_last_set_time(sam)); + } + pw = pdb_get_plaintext_passwd(sam); if (need_update(sam, PDB_PLAINTEXT_PW)) { if (pw == NULL) { @@ -407,15 +416,6 @@ static int pdb_samba4_replace_by_sam(struct pdb_samba4_state *state, } - /* If we set a plaintext password, the system will - * force the pwdLastSet to now(), and it isn't worth - * working around this for the real world use cases of - * pdb_samba4 */ - if (need_update(sam, PDB_PASSLASTSET)) { - ret |= pdb_samba4_add_time(msg, "pwdLastSet", - pdb_get_pass_last_set_time(sam)); - } - if (need_update(sam, PDB_PWHISTORY)) { uint32_t current_hist_len; const uint8_t *history = pdb_get_pw_history(sam, ¤t_hist_len); |