mirror of
https://github.com/samba-team/samba.git
synced 2025-02-09 09:57:48 +03:00
Remove unused marshalling for NET_SRV_PWSET.
Guenther (This used to be commit e48737f04d2324b604f3290904ec6163a6242ae5)
This commit is contained in:
parent
dd65a34935
commit
697f8904e7
@ -309,19 +309,6 @@ typedef struct net_r_auth3_info {
|
|||||||
} NET_R_AUTH_3;
|
} NET_R_AUTH_3;
|
||||||
|
|
||||||
|
|
||||||
/* NET_Q_SRV_PWSET */
|
|
||||||
typedef struct net_q_srv_pwset_info {
|
|
||||||
DOM_CLNT_INFO clnt_id; /* client identification/authentication info */
|
|
||||||
uint8 pwd[16]; /* new password - undocumented. */
|
|
||||||
} NET_Q_SRV_PWSET;
|
|
||||||
|
|
||||||
/* NET_R_SRV_PWSET */
|
|
||||||
typedef struct net_r_srv_pwset_info {
|
|
||||||
DOM_CRED srv_cred; /* server-calculated credentials */
|
|
||||||
|
|
||||||
NTSTATUS status; /* return code */
|
|
||||||
} NET_R_SRV_PWSET;
|
|
||||||
|
|
||||||
/* NET_ID_INFO_2 */
|
/* NET_ID_INFO_2 */
|
||||||
typedef struct net_network_info_2 {
|
typedef struct net_network_info_2 {
|
||||||
uint32 ptr_id_info2; /* pointer to id_info_2 */
|
uint32 ptr_id_info2; /* pointer to id_info_2 */
|
||||||
|
@ -577,51 +577,3 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***************************************************************************
|
|
||||||
LSA Server Password Set.
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
NTSTATUS rpccli_net_srv_pwset(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
|
||||||
const char *machine_name, const uint8 hashed_mach_pwd[16])
|
|
||||||
{
|
|
||||||
prs_struct rbuf;
|
|
||||||
prs_struct qbuf;
|
|
||||||
DOM_CRED clnt_creds;
|
|
||||||
NET_Q_SRV_PWSET q;
|
|
||||||
NET_R_SRV_PWSET r;
|
|
||||||
uint16 sec_chan_type = 2;
|
|
||||||
NTSTATUS result;
|
|
||||||
|
|
||||||
creds_client_step(cli->dc, &clnt_creds);
|
|
||||||
|
|
||||||
DEBUG(4,("cli_net_srv_pwset: srv:%s acct:%s sc: %d mc: %s\n",
|
|
||||||
cli->dc->remote_machine, cli->dc->mach_acct, sec_chan_type, machine_name));
|
|
||||||
|
|
||||||
/* store the parameters */
|
|
||||||
init_q_srv_pwset(&q, cli->dc->remote_machine, (const char *)cli->dc->sess_key,
|
|
||||||
cli->dc->mach_acct, sec_chan_type, machine_name,
|
|
||||||
&clnt_creds, hashed_mach_pwd);
|
|
||||||
|
|
||||||
CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_SRVPWSET,
|
|
||||||
q, r,
|
|
||||||
qbuf, rbuf,
|
|
||||||
net_io_q_srv_pwset,
|
|
||||||
net_io_r_srv_pwset,
|
|
||||||
NT_STATUS_UNSUCCESSFUL);
|
|
||||||
|
|
||||||
result = r.status;
|
|
||||||
|
|
||||||
if (!NT_STATUS_IS_OK(result)) {
|
|
||||||
/* report error code */
|
|
||||||
DEBUG(0,("cli_net_srv_pwset: %s\n", nt_errstr(result)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Always check returned credentials. */
|
|
||||||
if (!creds_client_check(cli->dc, &r.srv_cred.challenge)) {
|
|
||||||
DEBUG(0,("rpccli_net_srv_pwset: credentials chain check failed\n"));
|
|
||||||
return NT_STATUS_ACCESS_DENIED;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
@ -164,74 +164,6 @@ bool net_io_r_auth_3(const char *desc, NET_R_AUTH_3 *r_a, prs_struct *ps, int de
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************
|
|
||||||
Inits a NET_Q_SRV_PWSET.
|
|
||||||
********************************************************************/
|
|
||||||
|
|
||||||
void init_q_srv_pwset(NET_Q_SRV_PWSET *q_s,
|
|
||||||
const char *logon_srv, const char *sess_key, const char *acct_name,
|
|
||||||
uint16 sec_chan, const char *comp_name,
|
|
||||||
DOM_CRED *cred, const uchar hashed_mach_pwd[16])
|
|
||||||
{
|
|
||||||
unsigned char nt_cypher[16];
|
|
||||||
|
|
||||||
DEBUG(5,("init_q_srv_pwset\n"));
|
|
||||||
|
|
||||||
/* Process the new password. */
|
|
||||||
cred_hash3( nt_cypher, hashed_mach_pwd, (const unsigned char *)sess_key, 1);
|
|
||||||
|
|
||||||
init_clnt_info(&q_s->clnt_id, logon_srv, acct_name, sec_chan, comp_name, cred);
|
|
||||||
|
|
||||||
memcpy(q_s->pwd, nt_cypher, sizeof(q_s->pwd));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*******************************************************************
|
|
||||||
Reads or writes a structure.
|
|
||||||
********************************************************************/
|
|
||||||
|
|
||||||
bool net_io_q_srv_pwset(const char *desc, NET_Q_SRV_PWSET *q_s, prs_struct *ps, int depth)
|
|
||||||
{
|
|
||||||
if (q_s == NULL)
|
|
||||||
return False;
|
|
||||||
|
|
||||||
prs_debug(ps, depth, desc, "net_io_q_srv_pwset");
|
|
||||||
depth++;
|
|
||||||
|
|
||||||
if(!prs_align(ps))
|
|
||||||
return False;
|
|
||||||
|
|
||||||
if(!smb_io_clnt_info("", &q_s->clnt_id, ps, depth)) /* client identification/authentication info */
|
|
||||||
return False;
|
|
||||||
if(!prs_uint8s (False, "pwd", ps, depth, q_s->pwd, 16)) /* new password - undocumented */
|
|
||||||
return False;
|
|
||||||
|
|
||||||
return True;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*******************************************************************
|
|
||||||
Reads or writes a structure.
|
|
||||||
********************************************************************/
|
|
||||||
|
|
||||||
bool net_io_r_srv_pwset(const char *desc, NET_R_SRV_PWSET *r_s, prs_struct *ps, int depth)
|
|
||||||
{
|
|
||||||
if (r_s == NULL)
|
|
||||||
return False;
|
|
||||||
|
|
||||||
prs_debug(ps, depth, desc, "net_io_r_srv_pwset");
|
|
||||||
depth++;
|
|
||||||
|
|
||||||
if(!prs_align(ps))
|
|
||||||
return False;
|
|
||||||
|
|
||||||
if(!smb_io_cred("", &r_s->srv_cred, ps, depth)) /* server challenge */
|
|
||||||
return False;
|
|
||||||
|
|
||||||
if(!prs_ntstatus("status", ps, depth, &r_s->status))
|
|
||||||
return False;
|
|
||||||
|
|
||||||
return True;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
Init DOM_SID2 array from a string containing multiple sids
|
Init DOM_SID2 array from a string containing multiple sids
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user