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

Use pidl for _samr_ChangePasswordUser3().

Browse Source 
Guenther
(This used to be commit 07c28f308624207c0c8a75d2f1783aa1d1aae05a)
This commit is contained in:
Günther Deschner 2008-02-05 18:44:30 +01:00
parent 8fabdec776
commit 1b35cc2e08
2 changed files with 42 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/rpc_server/srv_samr.c
View File

@ -446,29 +446,7 @@ static bool api_samr_connect4(pipes_struct *p)
static bool api_samr_chgpasswd_user3(pipes_struct *p)
{
SAMR_Q_CHGPASSWD_USER3 q_u;
SAMR_R_CHGPASSWD_USER3 r_u;
prs_struct *data = &p->in_data.data;
prs_struct *rdata = &p->out_data.rdata;
ZERO_STRUCT(q_u);
ZERO_STRUCT(r_u);
/* change password request */
if (!samr_io_q_chgpasswd_user3("", &q_u, data, 0)) {
DEBUG(0,("api_samr_chgpasswd_user3: Failed to unmarshall SAMR_Q_CHGPASSWD_USER3.\n"));
return False;
}
r_u.status = _samr_chgpasswd_user3(p, &q_u, &r_u);
/* store the response in the SMB stream */
if(!samr_io_r_chgpasswd_user3("", &r_u, rdata, 0)) {
DEBUG(0,("api_samr_chgpasswd_user3: Failed to marshall SAMR_R_CHGPASSWD_USER3.\n" ));
return False;
}
return True;
return proxy_samr_call(p, NDR_SAMR_CHANGEPASSWORDUSER3);
}
/*******************************************************************

76
source3/rpc_server/srv_samr_nt.c
View File

@ -1562,23 +1562,27 @@ NTSTATUS _samr_ChangePasswordUser2(pipes_struct *p,
}
/*******************************************************************
_samr_chgpasswd_user3
_samr_ChangePasswordUser3
********************************************************************/
NTSTATUS _samr_chgpasswd_user3(pipes_struct *p, SAMR_Q_CHGPASSWD_USER3 *q_u, SAMR_R_CHGPASSWD_USER3 *r_u)
NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
struct samr_ChangePasswordUser3 *r)
{
NTSTATUS status;
fstring user_name;
fstring wks;
const char *wks = NULL;
uint32 reject_reason;
SAM_UNK_INFO_1 *info = NULL;
SAMR_CHANGE_REJECT *reject = NULL;
struct samr_DomInfo1 *dominfo = NULL;
struct samr_ChangeReject *reject = NULL;
DEBUG(5,("_samr_chgpasswd_user3: %d\n", __LINE__));
DEBUG(5,("_samr_ChangePasswordUser3: %d\n", __LINE__));
rpcstr_pull(user_name, q_u->uni_user_name.buffer, sizeof(user_name), q_u->uni_user_name.uni_str_len*2, 0);
rpcstr_pull(wks, q_u->uni_dest_host.buffer, sizeof(wks), q_u->uni_dest_host.uni_str_len*2,0);
fstrcpy(user_name, r->in.account->string);
if (r->in.server && r->in.server->string) {
wks = r->in.server->string;
}
DEBUG(5,("_samr_chgpasswd_user3: user: %s wks: %s\n", user_name, wks));
DEBUG(5,("_samr_ChangePasswordUser3: user: %s wks: %s\n", user_name, wks));
/*
* Pass the user through the NT -> unix user mapping
@ -1592,28 +1596,31 @@ NTSTATUS _samr_chgpasswd_user3(pipes_struct *p, SAMR_Q_CHGPASSWD_USER3 *q_u, SAM
* is case insensitive.
*/
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, &reject_reason);
status = pass_oem_change(user_name,
r->in.lm_password->data,
r->in.lm_verifier->hash,
r->in.nt_password->data,
r->in.nt_verifier->hash,
&reject_reason);
if (NT_STATUS_EQUAL(r_u->status, NT_STATUS_PASSWORD_RESTRICTION) ||
NT_STATUS_EQUAL(r_u->status, NT_STATUS_ACCOUNT_RESTRICTION)) {
if (NT_STATUS_EQUAL(status, NT_STATUS_PASSWORD_RESTRICTION) ||
NT_STATUS_EQUAL(status, NT_STATUS_ACCOUNT_RESTRICTION)) {
uint32 min_pass_len,pass_hist,password_properties;
time_t u_expire, u_min_age;
NTTIME nt_expire, nt_min_age;
uint32 account_policy_temp;
if ((info = TALLOC_ZERO_P(p->mem_ctx, SAM_UNK_INFO_1)) == NULL) {
dominfo = TALLOC_ZERO_P(p->mem_ctx, struct samr_DomInfo1);
if (!dominfo) {
return NT_STATUS_NO_MEMORY;
}
if ((reject = TALLOC_ZERO_P(p->mem_ctx, SAMR_CHANGE_REJECT)) == NULL) {
reject = TALLOC_ZERO_P(p->mem_ctx, struct samr_ChangeReject);
if (!reject) {
return NT_STATUS_NO_MEMORY;
}
ZERO_STRUCTP(info);
ZERO_STRUCTP(reject);
become_root();
/* AS ROOT !!! */
@ -1640,17 +1647,26 @@ NTSTATUS _samr_chgpasswd_user3(pipes_struct *p, SAMR_Q_CHGPASSWD_USER3 *q_u, SAM
unix_to_nt_time_abs(&nt_expire, u_expire);
unix_to_nt_time_abs(&nt_min_age, u_min_age);
init_unk_info1(info, (uint16)min_pass_len, (uint16)pass_hist,
password_properties, nt_expire, nt_min_age);
if (lp_check_password_script() && *lp_check_password_script()) {
password_properties |= DOMAIN_PASSWORD_COMPLEX;
}
reject->reject_reason = reject_reason;
init_samr_DomInfo1(dominfo,
min_pass_len,
pass_hist,
password_properties,
u_expire,
u_min_age);
reject->reason = reject_reason;
*r->out.dominfo = dominfo;
*r->out.reject = reject;
}
init_samr_r_chgpasswd_user3(r_u, r_u->status, reject, info);
DEBUG(5,("_samr_ChangePasswordUser3: %d\n", __LINE__));
DEBUG(5,("_samr_chgpasswd_user3: %d\n", __LINE__));
return r_u->status;
return status;
}
/*******************************************************************
@ -5428,16 +5444,6 @@ NTSTATUS _samr_Connect3(pipes_struct *p,
/****************************************************************
****************************************************************/
NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
struct samr_ChangePasswordUser3 *r)
{
p->rng_fault_state = true;
return NT_STATUS_NOT_IMPLEMENTED;
}
/****************************************************************
****************************************************************/
NTSTATUS _samr_RidToSid(pipes_struct *p,
struct samr_RidToSid *r)
{