summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-04 08:45:17 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-04 08:45:17 +0000
commite3ed8eaa2fd47a72c7b89d769ee594f238130ff7 (patch)
treeb39494a155ac00e8502cc2fec09e6f83474576f4 /source3/rpc_server
parent1bb969520392ea41b1c6841af2164bbca01381fe (diff)
downloadsamba-e3ed8eaa2fd47a72c7b89d769ee594f238130ff7.tar.gz
samba-e3ed8eaa2fd47a72c7b89d769ee594f238130ff7.tar.bz2
samba-e3ed8eaa2fd47a72c7b89d769ee594f238130ff7.zip
Merge from HEAD - move user password changes into the NTSTATUS era, and add
suppport for the 'min password age' and 'min passwd len' concepts. (This used to be commit d9417b08d1b649e598b44135bc57008f4e4f7769)
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_samr_nt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index fd152aa3b3..c72153eda7 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1524,9 +1524,8 @@ NTSTATUS _samr_chgpasswd_user(pipes_struct *p, SAMR_Q_CHGPASSWD_USER *q_u, SAMR_
* is case insensitive.
*/
- if (!pass_oem_change(user_name, q_u->lm_newpass.pass, q_u->lm_oldhash.hash,
- q_u->nt_newpass.pass, q_u->nt_oldhash.hash))
- r_u->status = NT_STATUS_WRONG_PASSWORD;
+ r_u->status = pass_oem_change(user_name, q_u->lm_newpass.pass, q_u->lm_oldhash.hash,
+ q_u->nt_newpass.pass, q_u->nt_oldhash.hash);
init_samr_r_chgpasswd_user(r_u, r_u->status);