svn commit: samba r19143 - in branches/SAMBA_3_0/source: include
nsswitch rpc_client rpc_parse rpcclient
gd at samba.org
gd at samba.org
Fri Oct 6 16:13:11 GMT 2006
Author: gd
Date: 2006-10-06 16:13:10 +0000 (Fri, 06 Oct 2006)
New Revision: 19143
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19143
Log:
getdcname on the NETLOGON pipe returns WERROR, not NTSTATUS.
Guenther
Modified:
branches/SAMBA_3_0/source/include/rpc_netlogon.h
branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c
branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
branches/SAMBA_3_0/source/rpc_parse/parse_net.c
branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/rpc_netlogon.h
===================================================================
--- branches/SAMBA_3_0/source/include/rpc_netlogon.h 2006-10-06 15:50:26 UTC (rev 19142)
+++ branches/SAMBA_3_0/source/include/rpc_netlogon.h 2006-10-06 16:13:10 UTC (rev 19143)
@@ -421,7 +421,7 @@
typedef struct net_r_getdcname {
uint32 ptr_dcname;
UNISTR2 uni_dcname;
- NTSTATUS status;
+ WERROR status;
} NET_R_GETDCNAME;
/* NET_Q_TRUST_DOM_LIST - LSA Query Trusted Domains */
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c 2006-10-06 15:50:26 UTC (rev 19142)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c 2006-10-06 16:13:10 UTC (rev 19143)
@@ -289,6 +289,7 @@
struct winbindd_domain *our_domain = NULL;
struct rpc_pipe_client *netlogon_pipe = NULL;
NTSTATUS result;
+ WERROR werr;
TALLOC_CTX *mem_ctx;
fstring tmp;
@@ -316,14 +317,14 @@
return False;
}
- result = rpccli_netlogon_getdcname(netlogon_pipe, mem_ctx, our_domain->dcname,
+ werr = rpccli_netlogon_getdcname(netlogon_pipe, mem_ctx, our_domain->dcname,
domain->name, tmp);
talloc_destroy(mem_ctx);
- if (!NT_STATUS_IS_OK(result)) {
+ if (!W_ERROR_IS_OK(werr)) {
DEBUG(10, ("rpccli_netlogon_getdcname failed: %s\n",
- nt_errstr(result)));
+ dos_errstr(werr)));
return False;
}
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c 2006-10-06 15:50:26 UTC (rev 19142)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c 2006-10-06 16:13:10 UTC (rev 19143)
@@ -195,6 +195,7 @@
char *p;
struct rpc_pipe_client *netlogon_pipe;
NTSTATUS result;
+ WERROR werr;
state->request.domain_name
[sizeof(state->request.domain_name)-1] = '\0';
@@ -209,12 +210,12 @@
return WINBINDD_ERROR;
}
- result = rpccli_netlogon_getdcname(netlogon_pipe, state->mem_ctx, domain->dcname,
+ werr = rpccli_netlogon_getdcname(netlogon_pipe, state->mem_ctx, domain->dcname,
state->request.domain_name,
dcname_slash);
- if (!NT_STATUS_IS_OK(result)) {
- DEBUG(5, ("Error requesting DCname: %s\n", nt_errstr(result)));
+ if (!W_ERROR_IS_OK(werr)) {
+ DEBUG(5, ("Error requesting DCname: %s\n", dos_errstr(werr)));
return WINBINDD_ERROR;
}
Modified: branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c 2006-10-06 15:50:26 UTC (rev 19142)
+++ branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c 2006-10-06 16:13:10 UTC (rev 19143)
@@ -382,14 +382,14 @@
/* GetDCName */
-NTSTATUS rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx, const char *mydcname,
- const char *domainname, fstring newdcname)
+WERROR rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx, const char *mydcname,
+ const char *domainname, fstring newdcname)
{
prs_struct qbuf, rbuf;
NET_Q_GETDCNAME q;
NET_R_GETDCNAME r;
- NTSTATUS result;
+ WERROR result;
fstring mydcname_slash;
ZERO_STRUCT(q);
@@ -402,16 +402,16 @@
/* 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,
qbuf, rbuf,
net_io_q_getdcname,
net_io_r_getdcname,
- NT_STATUS_UNSUCCESSFUL);
+ WERR_GENERAL_FAILURE);
result = r.status;
- if (NT_STATUS_IS_OK(result)) {
+ if (W_ERROR_IS_OK(result)) {
rpcstr_pull_unistr2_fstring(newdcname, &r.uni_dcname);
}
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_net.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_net.c 2006-10-06 15:50:26 UTC (rev 19142)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_net.c 2006-10-06 16:13:10 UTC (rev 19143)
@@ -560,7 +560,7 @@
if (!prs_align(ps))
return False;
- if (!prs_ntstatus("status", ps, depth, &r_t->status))
+ if (!prs_werror("status", ps, depth, &r_t->status))
return False;
return True;
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c 2006-10-06 15:50:26 UTC (rev 19142)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c 2006-10-06 16:13:10 UTC (rev 19143)
@@ -45,21 +45,21 @@
return result;
}
-static NTSTATUS cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx, int argc,
- const char **argv)
+static WERROR cmd_netlogon_getdcname(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx, int argc,
+ const char **argv)
{
fstring dcname;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ WERROR result = WERR_GENERAL_FAILURE;
if (argc != 2) {
fprintf(stderr, "Usage: %s domainname\n", argv[0]);
- return NT_STATUS_OK;
+ return WERR_OK;
}
result = rpccli_netlogon_getdcname(cli, mem_ctx, cli->cli->desthost, argv[1], dcname);
- if (!NT_STATUS_IS_OK(result))
+ if (!W_ERROR_IS_OK(result))
goto done;
/* Display results */
@@ -368,7 +368,7 @@
{ "NETLOGON" },
{ "logonctrl2", RPC_RTYPE_NTSTATUS, cmd_netlogon_logon_ctrl2, NULL, PI_NETLOGON, NULL, "Logon Control 2", "" },
- { "getdcname", RPC_RTYPE_NTSTATUS, cmd_netlogon_getdcname, NULL, PI_NETLOGON, NULL, "Get trusted DC name", "" },
+ { "getdcname", RPC_RTYPE_WERROR, NULL, cmd_netlogon_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_getsitename", RPC_RTYPE_WERROR, NULL, cmd_netlogon_dsr_getsitename, PI_NETLOGON, NULL, "Get sitename", "" },
{ "logonctrl", RPC_RTYPE_NTSTATUS, cmd_netlogon_logon_ctrl, NULL, PI_NETLOGON, NULL, "Logon Control", "" },
More information about the samba-cvs
mailing list