mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
Remove unused marshalling for SAMR_CONNECT_4.
Guenther
This commit is contained in:
parent
7e0e74ff54
commit
86d00328ae
@ -1488,19 +1488,6 @@ typedef struct r_samr_connect_info
|
||||
|
||||
} SAMR_R_CONNECT;
|
||||
|
||||
/* SAMR_Q_CONNECT4 */
|
||||
typedef struct q_samr_connect4_info
|
||||
{
|
||||
uint32 ptr_srv_name; /* pointer to server name */
|
||||
UNISTR2 uni_srv_name;
|
||||
|
||||
uint32 unk_0; /* possible server name type, 1 for IP num, 2 for name */
|
||||
uint32 access_mask;
|
||||
} SAMR_Q_CONNECT4;
|
||||
|
||||
/* SAMR_R_CONNECT4 - same format as connect */
|
||||
typedef struct r_samr_connect_info SAMR_R_CONNECT4;
|
||||
|
||||
/* SAMR_ENC_PASSWD */
|
||||
typedef struct enc_passwd_info
|
||||
{
|
||||
|
@ -59,42 +59,6 @@ NTSTATUS rpccli_samr_connect(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Connect to SAMR database */
|
||||
|
||||
NTSTATUS rpccli_samr_connect4(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
||||
uint32 access_mask, POLICY_HND *connect_pol)
|
||||
{
|
||||
prs_struct qbuf, rbuf;
|
||||
SAMR_Q_CONNECT4 q;
|
||||
SAMR_R_CONNECT4 r;
|
||||
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
|
||||
|
||||
ZERO_STRUCT(q);
|
||||
ZERO_STRUCT(r);
|
||||
|
||||
/* Marshall data and send request */
|
||||
|
||||
init_samr_q_connect4(&q, cli->cli->desthost, access_mask);
|
||||
|
||||
CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_CONNECT4,
|
||||
q, r,
|
||||
qbuf, rbuf,
|
||||
samr_io_q_connect4,
|
||||
samr_io_r_connect4,
|
||||
NT_STATUS_UNSUCCESSFUL);
|
||||
|
||||
/* Return output parameters */
|
||||
|
||||
if (NT_STATUS_IS_OK(result = r.status)) {
|
||||
*connect_pol = r.connect_pol;
|
||||
#ifdef __INSURE__
|
||||
connect_pol->marker = malloc(1);
|
||||
#endif
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Query user info */
|
||||
|
||||
NTSTATUS rpccli_samr_query_userinfo(struct rpc_pipe_client *cli,
|
||||
|
@ -5994,82 +5994,6 @@ bool samr_io_r_connect(const char *desc, SAMR_R_CONNECT * r_u,
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
inits a SAMR_Q_CONNECT4 structure.
|
||||
********************************************************************/
|
||||
|
||||
void init_samr_q_connect4(SAMR_Q_CONNECT4 * q_u,
|
||||
char *srv_name, uint32 access_mask)
|
||||
{
|
||||
DEBUG(5, ("init_samr_q_connect4\n"));
|
||||
|
||||
/* make PDC server name \\server */
|
||||
q_u->ptr_srv_name = (srv_name != NULL && *srv_name) ? 1 : 0;
|
||||
init_unistr2(&q_u->uni_srv_name, srv_name, UNI_STR_TERMINATE);
|
||||
|
||||
/* Only value we've seen, possibly an address type ? */
|
||||
q_u->unk_0 = 2;
|
||||
|
||||
/* example values: 0x0000 0002 */
|
||||
q_u->access_mask = access_mask;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
|
||||
bool samr_io_q_connect4(const char *desc, SAMR_Q_CONNECT4 * q_u,
|
||||
prs_struct *ps, int depth)
|
||||
{
|
||||
if (q_u == NULL)
|
||||
return False;
|
||||
|
||||
prs_debug(ps, depth, desc, "samr_io_q_connect4");
|
||||
depth++;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
|
||||
if(!prs_uint32("ptr_srv_name", ps, depth, &q_u->ptr_srv_name))
|
||||
return False;
|
||||
if(!smb_io_unistr2("", &q_u->uni_srv_name, q_u->ptr_srv_name, ps, depth))
|
||||
return False;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
if(!prs_uint32("unk_0", ps, depth, &q_u->unk_0))
|
||||
return False;
|
||||
if(!prs_uint32("access_mask", ps, depth, &q_u->access_mask))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
|
||||
bool samr_io_r_connect4(const char *desc, SAMR_R_CONNECT4 * r_u,
|
||||
prs_struct *ps, int depth)
|
||||
{
|
||||
if (r_u == NULL)
|
||||
return False;
|
||||
|
||||
prs_debug(ps, depth, desc, "samr_io_r_connect4");
|
||||
depth++;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
|
||||
if(!smb_io_pol_hnd("connect_pol", &r_u->connect_pol, ps, depth))
|
||||
return False;
|
||||
|
||||
if(!prs_ntstatus("status", ps, depth, &r_u->status))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
make a SAMR_ENC_PASSWD structure.
|
||||
********************************************************************/
|
||||
|
Loading…
Reference in New Issue
Block a user