mirror of
https://github.com/samba-team/samba.git
synced 2025-02-05 21:57:51 +03:00
r11338: Move knowledge of \\ needed into rpc_client/cli_netlogon
(this is the way it's been done in other functions). Instead of moving this into the IDL, I think the best solution would be to write a wrapper function around any call that needs this (this is what we already do for many of the calls). Jeremy.
This commit is contained in:
parent
f313757e36
commit
aeca4efa11
@ -105,7 +105,6 @@ static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain,
|
||||
struct rpc_pipe_client *netlogon_pipe;
|
||||
NTSTATUS result;
|
||||
TALLOC_CTX *mem_ctx;
|
||||
const char *server_name;
|
||||
|
||||
fstring tmp;
|
||||
char *p;
|
||||
@ -132,12 +131,7 @@ static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain,
|
||||
return False;
|
||||
}
|
||||
|
||||
server_name = talloc_asprintf(mem_ctx, "\\\\%s", our_domain->dcname);
|
||||
if (server_name == NULL) {
|
||||
return False;
|
||||
}
|
||||
|
||||
result = rpccli_netlogon_getdcname(netlogon_pipe, mem_ctx, server_name,
|
||||
result = rpccli_netlogon_getdcname(netlogon_pipe, mem_ctx, our_domain->dcname,
|
||||
domain->name, tmp);
|
||||
|
||||
talloc_destroy(mem_ctx);
|
||||
|
@ -388,13 +388,15 @@ NTSTATUS rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
|
||||
NET_Q_GETDCNAME q;
|
||||
NET_R_GETDCNAME r;
|
||||
NTSTATUS result;
|
||||
fstring mydcname_slash;
|
||||
|
||||
ZERO_STRUCT(q);
|
||||
ZERO_STRUCT(r);
|
||||
|
||||
/* Initialise input parameters */
|
||||
|
||||
init_net_q_getdcname(&q, mydcname, domainname);
|
||||
slprintf(mydcname_slash, sizeof(fstring)-1, "\\\\%s", mydcname);
|
||||
init_net_q_getdcname(&q, mydcname_slash, domainname);
|
||||
|
||||
/* Marshall data and send request */
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user