diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-07-05 17:42:40 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-07-06 21:54:21 +0200 |
| commit | b03040c5a903e24a8216b9245f2925eb2205cd67 (patch) | |
| tree | 8e8e57fd733e2f13bed3bacd11fc85dc9dbdb5fd | |
| parent | 7f15ca4427ae07520a457fa8f19991f6e350205b (diff) | |
| download | samba-b03040c5a903e24a8216b9245f2925eb2205cd67.tar.gz samba-b03040c5a903e24a8216b9245f2925eb2205cd67.tar.bz2 samba-b03040c5a903e24a8216b9245f2925eb2205cd67.zip | |
s4:SAMR rpc server - "SetUserInfo" - fix the implementation of the expire flag
It has to consider the "password_expires" flag to known if the "pwdLastSet" has
to be updated or to be resetted.
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 1361b681f1..cca828aa17 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -3281,9 +3281,16 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL } } + IFSET(SAMR_FIELD_EXPIRED_FLAG) { + NTTIME t = 0; struct ldb_message_element *set_el; - if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, "pwdLastSet", 0) != LDB_SUCCESS) { + if (r->in.info->info21.password_expired + == PASS_DONT_CHANGE_AT_NEXT_LOGON) { + unix_to_nt_time(&t, time(NULL)); + } + if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, + "pwdLastSet", t) != LDB_SUCCESS) { return NT_STATUS_NO_MEMORY; } set_el = ldb_msg_find_element(msg, "pwdLastSet"); @@ -3363,8 +3370,14 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL } IFSET(SAMR_FIELD_EXPIRED_FLAG) { + NTTIME t = 0; struct ldb_message_element *set_el; - if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, "pwdLastSet", 0) != LDB_SUCCESS) { + if (r->in.info->info23.info.password_expired + == PASS_DONT_CHANGE_AT_NEXT_LOGON) { + unix_to_nt_time(&t, time(NULL)); + } + if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, + "pwdLastSet", t) != LDB_SUCCESS) { return NT_STATUS_NO_MEMORY; } set_el = ldb_msg_find_element(msg, "pwdLastSet"); @@ -3465,8 +3478,14 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL } IFSET(SAMR_FIELD_EXPIRED_FLAG) { + NTTIME t = 0; struct ldb_message_element *set_el; - if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, "pwdLastSet", 0) != LDB_SUCCESS) { + if (r->in.info->info25.info.password_expired + == PASS_DONT_CHANGE_AT_NEXT_LOGON) { + unix_to_nt_time(&t, time(NULL)); + } + if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, + "pwdLastSet", t) != LDB_SUCCESS) { return NT_STATUS_NO_MEMORY; } set_el = ldb_msg_find_element(msg, "pwdLastSet"); |