diff options
| author | Jeremy Allison <jra@samba.org> | 2005-10-27 18:25:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:13 -0500 |
| commit | 7aecd20c00b81aa2b7a20e75e9cc653ae243500b (patch) | |
| tree | 831b4e5926d5a0135cc4f5f922388fbbeaad0e40 /source3 | |
| parent | ca551d55a894dc88c9374eb1ca0ce4b4005a22a2 (diff) | |
| download | samba-7aecd20c00b81aa2b7a20e75e9cc653ae243500b.tar.gz samba-7aecd20c00b81aa2b7a20e75e9cc653ae243500b.tar.bz2 samba-7aecd20c00b81aa2b7a20e75e9cc653ae243500b.zip | |
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 used to be commit aeca4efa11728be53b81967bb5442b5b09d1a975)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 8 | ||||
| -rw-r--r-- | source3/rpc_client/cli_netlogon.c | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index 4e11206c9c..e38d4cc426 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -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); diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index 78e682d12a..ee45331975 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -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 */ |