sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

r23380: netr_getdcname returns WERROR not NTSTATUS.

Browse Source 
Guenther
(This used to be commit 5e75ea7f2b568d76c8ced5f43171741532cc97c2)
This commit is contained in:
Günther Deschner 2007-06-08 10:29:46 +00:00 committed by Gerald (Jerry) Carter
parent 774ceeea50
commit 1ea5dfae04
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/rpc_netlogon.h
View File

@ -442,7 +442,7 @@ typedef struct net_q_getdcname {
typedef struct net_r_getdcname { typedef struct net_r_getdcname {
uint32 ptr_dcname; uint32 ptr_dcname;
UNISTR2 uni_dcname; UNISTR2 uni_dcname;
NTSTATUS status; WERROR status;
} NET_R_GETDCNAME; } NET_R_GETDCNAME;
/* NET_Q_TRUST_DOM_LIST - LSA Query Trusted Domains */ /* NET_Q_TRUST_DOM_LIST - LSA Query Trusted Domains */

14
source3/rpc_client/cli_netlogon.c
View File

@ -420,14 +420,14 @@ WERROR rpccli_netlogon_getanydcname(struct rpc_pipe_client *cli,
/* GetDCName */ /* GetDCName */
NTSTATUS rpccli_netlogon_getdcname(struct rpc_pipe_client *cli, WERROR rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx, const char *mydcname, TALLOC_CTX *mem_ctx, const char *mydcname,
const char *domainname, fstring newdcname) const char *domainname, fstring newdcname)
{ {
prs_struct qbuf, rbuf; prs_struct qbuf, rbuf;
NET_Q_GETDCNAME q; NET_Q_GETDCNAME q;
NET_R_GETDCNAME r; NET_R_GETDCNAME r;
NTSTATUS result; WERROR result;
fstring mydcname_slash; fstring mydcname_slash;
ZERO_STRUCT(q); ZERO_STRUCT(q);
@ -440,16 +440,16 @@ NTSTATUS rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
/* Marshall data and send request */ /* Marshall data and send request */
CLI_DO_RPC(cli, mem_ctx, PI_NETLOGON, NET_GETDCNAME, CLI_DO_RPC_WERR(cli, mem_ctx, PI_NETLOGON, NET_GETDCNAME,
q, r, q, r,
qbuf, rbuf, qbuf, rbuf,
net_io_q_getdcname, net_io_q_getdcname,
net_io_r_getdcname, net_io_r_getdcname,
NT_STATUS_UNSUCCESSFUL); WERR_GENERAL_FAILURE);
result = r.status; result = r.status;
if (NT_STATUS_IS_OK(result)) { if (W_ERROR_IS_OK(result)) {
rpcstr_pull_unistr2_fstring(newdcname, &r.uni_dcname); rpcstr_pull_unistr2_fstring(newdcname, &r.uni_dcname);
} }

2
source3/rpc_parse/parse_net.c
View File

@ -644,7 +644,7 @@ BOOL net_io_r_getdcname(const char *desc, NET_R_GETDCNAME *r_t, prs_struct *ps,
if (!prs_align(ps)) if (!prs_align(ps))
return False; return False;
if (!prs_ntstatus("status", ps, depth, &r_t->status)) if (!prs_werror("status", ps, depth, &r_t->status))
return False; return False;
return True; return True;

14
source3/rpcclient/cmd_netlogon.c
View File

@ -76,17 +76,17 @@ static WERROR cmd_netlogon_getanydcname(struct rpc_pipe_client *cli,
return result; return result;
} }
static NTSTATUS cmd_netlogon_getdcname(struct rpc_pipe_client *cli, static WERROR cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx, int argc, TALLOC_CTX *mem_ctx, int argc,
const char **argv) const char **argv)
{ {
fstring dcname; fstring dcname;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL; WERROR result = WERR_GENERAL_FAILURE;
int old_timeout; int old_timeout;
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "Usage: %s domainname\n", argv[0]); fprintf(stderr, "Usage: %s domainname\n", argv[0]);
return NT_STATUS_OK; return WERR_OK;
} }
/* Make sure to wait for our DC's reply */ /* Make sure to wait for our DC's reply */
@ -96,7 +96,7 @@ static NTSTATUS cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
cli_set_timeout(cli->cli, old_timeout); cli_set_timeout(cli->cli, old_timeout);
if (!NT_STATUS_IS_OK(result)) if (!W_ERROR_IS_OK(result))
goto done; goto done;
/* Display results */ /* Display results */
@ -580,7 +580,7 @@ struct cmd_set netlogon_commands[] = {
{ "logonctrl2", RPC_RTYPE_NTSTATUS, cmd_netlogon_logon_ctrl2, NULL, PI_NETLOGON, NULL, "Logon Control 2", "" }, { "logonctrl2", RPC_RTYPE_NTSTATUS, cmd_netlogon_logon_ctrl2, NULL, PI_NETLOGON, NULL, "Logon Control 2", "" },
{ "getanydcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getanydcname, PI_NETLOGON, NULL, "Get trusted DC name", "" }, { "getanydcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getanydcname, PI_NETLOGON, NULL, "Get trusted DC name", "" },
{ "getdcname", RPC_RTYPE_NTSTATUS, cmd_netlogon_getdcname, NULL, PI_NETLOGON, NULL, "Get trusted PDC name", "" }, { "getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_getdcname, PI_NETLOGON, NULL, "Get trusted PDC name", "" },
{ "dsr_getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcname, PI_NETLOGON, NULL, "Get trusted DC name", "" }, { "dsr_getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcname, PI_NETLOGON, NULL, "Get trusted DC name", "" },
{ "dsr_getdcnameex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex, PI_NETLOGON, NULL, "Get trusted DC name", "" }, { "dsr_getdcnameex", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex, PI_NETLOGON, NULL, "Get trusted DC name", "" },
{ "dsr_getdcnameex2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex2, PI_NETLOGON, NULL, "Get trusted DC name", "" }, { "dsr_getdcnameex2", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getdcnameex2, PI_NETLOGON, NULL, "Get trusted DC name", "" },