mirror of
https://github.com/samba-team/samba.git
synced 2025-06-19 23:17:05 +03:00
Remove unused marshalling for NET_REQ_CHAL and NET_AUTH2.
Guenther (This used to be commit 2123aff75c8db431cb37d132058902287e740a85)
This commit is contained in:
Günther Deschner
parent
3f24ef1848
commit
26106d2e39
@ -281,22 +281,6 @@ typedef struct neg_flags_info {
|
||||
uint32 neg_flags; /* negotiated flags */
|
||||
} NEG_FLAGS;
|
||||
|
||||
|
||||
/* NET_Q_REQ_CHAL */
|
||||
typedef struct net_q_req_chal_info {
|
||||
uint32 undoc_buffer; /* undocumented buffer pointer */
|
||||
UNISTR2 uni_logon_srv; /* logon server unicode string */
|
||||
UNISTR2 uni_logon_clnt; /* logon client unicode string */
|
||||
DOM_CHAL clnt_chal; /* client challenge */
|
||||
} NET_Q_REQ_CHAL;
|
||||
|
||||
|
||||
/* NET_R_REQ_CHAL */
|
||||
typedef struct net_r_req_chal_info {
|
||||
DOM_CHAL srv_chal; /* server challenge */
|
||||
NTSTATUS status; /* return code */
|
||||
} NET_R_REQ_CHAL;
|
||||
|
||||
/* NET_Q_AUTH */
|
||||
typedef struct net_q_auth_info {
|
||||
DOM_LOG_INFO clnt_id; /* client identification info */
|
||||
@ -309,22 +293,6 @@ typedef struct net_r_auth_info {
|
||||
NTSTATUS status; /* return code */
|
||||
} NET_R_AUTH;
|
||||
|
||||
/* NET_Q_AUTH_2 */
|
||||
typedef struct net_q_auth2_info {
|
||||
DOM_LOG_INFO clnt_id; /* client identification info */
|
||||
DOM_CHAL clnt_chal; /* client-calculated credentials */
|
||||
|
||||
NEG_FLAGS clnt_flgs; /* usually 0x0000 01ff */
|
||||
} NET_Q_AUTH_2;
|
||||
|
||||
|
||||
/* NET_R_AUTH_2 */
|
||||
typedef struct net_r_auth2_info {
|
||||
DOM_CHAL srv_chal; /* server-calculated credentials */
|
||||
NEG_FLAGS srv_flgs; /* usually 0x0000 01ff */
|
||||
NTSTATUS status; /* return code */
|
||||
} NET_R_AUTH_2;
|
||||
|
||||
/* NET_Q_AUTH_3 */
|
||||
typedef struct net_q_auth3_info {
|
||||
DOM_LOG_INFO clnt_id; /* client identification info */
|
||||
|
||||
@ -27,45 +27,7 @@
|
||||
private data. Only call this via rpccli_netlogon_setup_creds(). JRA.
|
||||
*/
|
||||
|
||||
static NTSTATUS rpccli_net_req_chal(struct rpc_pipe_client *cli,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
const char *server_name,
|
||||
const char *clnt_name,
|
||||
const DOM_CHAL *clnt_chal_in,
|
||||
DOM_CHAL *srv_chal_out)
|
||||
{
|
||||
prs_struct qbuf, rbuf;
|
||||
NET_Q_REQ_CHAL q;
|
||||
NET_R_REQ_CHAL r;
|
||||
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
|
||||
|
||||
/* create and send a MSRPC command with api NET_REQCHAL */
|
||||
|
||||
DEBUG(4,("cli_net_req_chal: LSA Request Challenge from %s to %s\n",
|
||||
clnt_name, server_name));
|
||||
|
||||
/* store the parameters */
|
||||
init_q_req_chal(&q, server_name, clnt_name, clnt_chal_in);
|
||||
|
||||
/* Marshall data and send request */
|
||||
CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_REQCHAL,
|
||||
q, r,
|
||||
qbuf, rbuf,
|
||||
net_io_q_req_chal,
|
||||
net_io_r_req_chal,
|
||||
NT_STATUS_UNSUCCESSFUL);
|
||||
|
||||
result = r.status;
|
||||
|
||||
/* Return result */
|
||||
|
||||
if (NT_STATUS_IS_OK(result)) {
|
||||
/* Store the returned server challenge. */
|
||||
*srv_chal_out = r.srv_chal;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
/* instead of rpccli_net_req_chal() we use rpccli_netr_ServerReqChallenge() now - gd */
|
||||
|
||||
#if 0
|
||||
/****************************************************************************
|
||||
@ -147,50 +109,8 @@ password ?).\n", cli->cli->desthost ));
|
||||
encrypt of the server challenge originally received. JRA.
|
||||
****************************************************************************/
|
||||
|
||||
static NTSTATUS rpccli_net_auth2(struct rpc_pipe_client *cli,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
const char *server_name,
|
||||
const char *account_name,
|
||||
uint16 sec_chan_type,
|
||||
const char *computer_name,
|
||||
uint32 *neg_flags_inout,
|
||||
const DOM_CHAL *clnt_chal_in,
|
||||
DOM_CHAL *srv_chal_out)
|
||||
{
|
||||
prs_struct qbuf, rbuf;
|
||||
NET_Q_AUTH_2 q;
|
||||
NET_R_AUTH_2 r;
|
||||
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
|
||||
/* instead of rpccli_net_auth2() we use rpccli_netr_ServerAuthenticate2() now - gd */
|
||||
|
||||
/* create and send a MSRPC command with api NET_AUTH2 */
|
||||
|
||||
DEBUG(4,("cli_net_auth2: srv:%s acct:%s sc:%x mc: %s neg: %x\n",
|
||||
server_name, account_name, sec_chan_type, computer_name,
|
||||
*neg_flags_inout));
|
||||
|
||||
/* store the parameters */
|
||||
|
||||
init_q_auth_2(&q, server_name, account_name, sec_chan_type,
|
||||
computer_name, clnt_chal_in, *neg_flags_inout);
|
||||
|
||||
/* turn parameters into data stream */
|
||||
|
||||
CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_AUTH2,
|
||||
q, r,
|
||||
qbuf, rbuf,
|
||||
net_io_q_auth_2,
|
||||
net_io_r_auth_2,
|
||||
NT_STATUS_UNSUCCESSFUL);
|
||||
|
||||
result = r.status;
|
||||
|
||||
if (NT_STATUS_IS_OK(result)) {
|
||||
*srv_chal_out = r.srv_chal;
|
||||
*neg_flags_inout = r.srv_flgs.neg_flags;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#if 0 /* not currebntly used */
|
||||
/****************************************************************************
|
||||
|
||||
@ -46,80 +46,6 @@ static bool net_io_neg_flags(const char *desc, NEG_FLAGS *neg, prs_struct *ps, i
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Inits an NET_Q_REQ_CHAL structure.
|
||||
********************************************************************/
|
||||
|
||||
void init_q_req_chal(NET_Q_REQ_CHAL *q_c,
|
||||
const char *logon_srv, const char *logon_clnt,
|
||||
const DOM_CHAL *clnt_chal)
|
||||
{
|
||||
DEBUG(5,("init_q_req_chal: %d\n", __LINE__));
|
||||
|
||||
q_c->undoc_buffer = 1; /* don't know what this buffer is */
|
||||
|
||||
init_unistr2(&q_c->uni_logon_srv, logon_srv , UNI_STR_TERMINATE);
|
||||
init_unistr2(&q_c->uni_logon_clnt, logon_clnt, UNI_STR_TERMINATE);
|
||||
|
||||
memcpy(q_c->clnt_chal.data, clnt_chal->data, sizeof(clnt_chal->data));
|
||||
|
||||
DEBUG(5,("init_q_req_chal: %d\n", __LINE__));
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Reads or writes an NET_Q_REQ_CHAL structure.
|
||||
********************************************************************/
|
||||
|
||||
bool net_io_q_req_chal(const char *desc, NET_Q_REQ_CHAL *q_c, prs_struct *ps, int depth)
|
||||
{
|
||||
if (q_c == NULL)
|
||||
return False;
|
||||
|
||||
prs_debug(ps, depth, desc, "net_io_q_req_chal");
|
||||
depth++;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
|
||||
if(!prs_uint32("undoc_buffer", ps, depth, &q_c->undoc_buffer))
|
||||
return False;
|
||||
|
||||
if(!smb_io_unistr2("", &q_c->uni_logon_srv, True, ps, depth)) /* logon server unicode string */
|
||||
return False;
|
||||
if(!smb_io_unistr2("", &q_c->uni_logon_clnt, True, ps, depth)) /* logon client unicode string */
|
||||
return False;
|
||||
|
||||
if(!smb_io_chal("", &q_c->clnt_chal, ps, depth))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Reads or writes a structure.
|
||||
********************************************************************/
|
||||
|
||||
bool net_io_r_req_chal(const char *desc, NET_R_REQ_CHAL *r_c, prs_struct *ps, int depth)
|
||||
{
|
||||
if (r_c == NULL)
|
||||
return False;
|
||||
|
||||
prs_debug(ps, depth, desc, "net_io_r_req_chal");
|
||||
depth++;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
|
||||
if(!smb_io_chal("", &r_c->srv_chal, ps, depth)) /* server challenge */
|
||||
return False;
|
||||
|
||||
if(!prs_ntstatus("status", ps, depth, &r_c->status))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
Reads or writes a structure.
|
||||
********************************************************************/
|
||||
@ -167,74 +93,6 @@ bool net_io_r_auth(const char *desc, NET_R_AUTH *r_a, prs_struct *ps, int depth)
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Inits a NET_Q_AUTH_2 struct.
|
||||
********************************************************************/
|
||||
|
||||
void init_q_auth_2(NET_Q_AUTH_2 *q_a,
|
||||
const char *logon_srv, const char *acct_name, uint16 sec_chan, const char *comp_name,
|
||||
const DOM_CHAL *clnt_chal, uint32 clnt_flgs)
|
||||
{
|
||||
DEBUG(5,("init_q_auth_2: %d\n", __LINE__));
|
||||
|
||||
init_log_info(&q_a->clnt_id, logon_srv, acct_name, sec_chan, comp_name);
|
||||
memcpy(q_a->clnt_chal.data, clnt_chal->data, sizeof(clnt_chal->data));
|
||||
q_a->clnt_flgs.neg_flags = clnt_flgs;
|
||||
|
||||
DEBUG(5,("init_q_auth_2: %d\n", __LINE__));
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Reads or writes a structure.
|
||||
********************************************************************/
|
||||
|
||||
bool net_io_q_auth_2(const char *desc, NET_Q_AUTH_2 *q_a, prs_struct *ps, int depth)
|
||||
{
|
||||
if (q_a == NULL)
|
||||
return False;
|
||||
|
||||
prs_debug(ps, depth, desc, "net_io_q_auth_2");
|
||||
depth++;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
|
||||
if(!smb_io_log_info ("", &q_a->clnt_id, ps, depth)) /* client identification info */
|
||||
return False;
|
||||
if(!smb_io_chal("", &q_a->clnt_chal, ps, depth))
|
||||
return False;
|
||||
if(!net_io_neg_flags("", &q_a->clnt_flgs, ps, depth))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Reads or writes a structure.
|
||||
********************************************************************/
|
||||
|
||||
bool net_io_r_auth_2(const char *desc, NET_R_AUTH_2 *r_a, prs_struct *ps, int depth)
|
||||
{
|
||||
if (r_a == NULL)
|
||||
return False;
|
||||
|
||||
prs_debug(ps, depth, desc, "net_io_r_auth_2");
|
||||
depth++;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
|
||||
if(!smb_io_chal("", &r_a->srv_chal, ps, depth)) /* server challenge */
|
||||
return False;
|
||||
if(!net_io_neg_flags("", &r_a->srv_flgs, ps, depth))
|
||||
return False;
|
||||
|
||||
if(!prs_ntstatus("status", ps, depth, &r_a->status))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Inits a NET_Q_AUTH_3 struct.
|
||||
********************************************************************/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user