sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4:rpc_server/samr: only set pwdLastSet to "0" or "-1"

Browse Source 
The password_hash module will take care of translating "-1"
to the current time.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=9654

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2016-05-24 08:51:45 +02:00 committed by Andrew Bartlett
parent b6933b2fda
commit 97534fffe6
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source4/rpc_server/samr/dcesrv_samr.c
View File

@ -3299,14 +3299,13 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
IFSET(SAMR_FIELD_EXPIRED_FLAG) { IFSET(SAMR_FIELD_EXPIRED_FLAG) {
NTTIME t = 0; const char *t = "0";
struct ldb_message_element *set_el; struct ldb_message_element *set_el;
if (r->in.info->info21.password_expired if (r->in.info->info21.password_expired
== PASS_DONT_CHANGE_AT_NEXT_LOGON) { == PASS_DONT_CHANGE_AT_NEXT_LOGON) {
unix_to_nt_time(&t, time(NULL)); t = "-1";
} }
if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, if (ldb_msg_add_string(msg, "pwdLastSet", t) != LDB_SUCCESS) {
"pwdLastSet", t) != LDB_SUCCESS) {
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
set_el = ldb_msg_find_element(msg, "pwdLastSet"); set_el = ldb_msg_find_element(msg, "pwdLastSet");
@ -3386,14 +3385,13 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
} }
IFSET(SAMR_FIELD_EXPIRED_FLAG) { IFSET(SAMR_FIELD_EXPIRED_FLAG) {
NTTIME t = 0; const char *t = "0";
struct ldb_message_element *set_el; struct ldb_message_element *set_el;
if (r->in.info->info23.info.password_expired if (r->in.info->info23.info.password_expired
== PASS_DONT_CHANGE_AT_NEXT_LOGON) { == PASS_DONT_CHANGE_AT_NEXT_LOGON) {
unix_to_nt_time(&t, time(NULL)); t = "-1";
} }
if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, if (ldb_msg_add_string(msg, "pwdLastSet", t) != LDB_SUCCESS) {
"pwdLastSet", t) != LDB_SUCCESS) {
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
set_el = ldb_msg_find_element(msg, "pwdLastSet"); set_el = ldb_msg_find_element(msg, "pwdLastSet");
@ -3494,14 +3492,13 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
} }
IFSET(SAMR_FIELD_EXPIRED_FLAG) { IFSET(SAMR_FIELD_EXPIRED_FLAG) {
NTTIME t = 0; const char *t = "0";
struct ldb_message_element *set_el; struct ldb_message_element *set_el;
if (r->in.info->info25.info.password_expired if (r->in.info->info25.info.password_expired
== PASS_DONT_CHANGE_AT_NEXT_LOGON) { == PASS_DONT_CHANGE_AT_NEXT_LOGON) {
unix_to_nt_time(&t, time(NULL)); t = "-1";
} }
if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, if (ldb_msg_add_string(msg, "pwdLastSet", t) != LDB_SUCCESS) {
"pwdLastSet", t) != LDB_SUCCESS) {
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
set_el = ldb_msg_find_element(msg, "pwdLastSet"); set_el = ldb_msg_find_element(msg, "pwdLastSet");
@ -3523,14 +3520,13 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
} }
if (r->in.info->info26.password_expired > 0) { if (r->in.info->info26.password_expired > 0) {
NTTIME t = 0; const char *t = "0";
struct ldb_message_element *set_el; struct ldb_message_element *set_el;
if (r->in.info->info26.password_expired if (r->in.info->info26.password_expired
== PASS_DONT_CHANGE_AT_NEXT_LOGON) { == PASS_DONT_CHANGE_AT_NEXT_LOGON) {
unix_to_nt_time(&t, time(NULL)); t = "-1";
} }
if (samdb_msg_add_uint64(sam_ctx, mem_ctx, msg, if (ldb_msg_add_string(msg, "pwdLastSet", t) != LDB_SUCCESS) {
"pwdLastSet", t) != LDB_SUCCESS) {
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
set_el = ldb_msg_find_element(msg, "pwdLastSet"); set_el = ldb_msg_find_element(msg, "pwdLastSet");