diff options
| -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 */ |