diff options
| author | Günther Deschner <gd@samba.org> | 2007-05-29 15:27:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:54 -0500 |
| commit | def6464c872a5939f0028837254f2c019d2d71c8 (patch) | |
| tree | 0dfa9e8928a02d94bb3cca900f2ede892325a66a /source/nsswitch | |
| parent | dbee1088bb06a4ccb440d372102eb5c105cc4294 (diff) | |
| download | samba-def6464c872a5939f0028837254f2c019d2d71c8.tar.gz samba-def6464c872a5939f0028837254f2c019d2d71c8.tar.xz samba-def6464c872a5939f0028837254f2c019d2d71c8.zip | |
r23210: Very funny, we thought to use netr_GetDcName (e.g. in winbind) but were using
netr_GetDcAnyName all the time (which is the correct thing to do).
Fix the naming and opcode mixup in all branches.
Guenther
Diffstat (limited to 'source/nsswitch')
| -rw-r--r-- | source/nsswitch/winbindd_cm.c | 10 | ||||
| -rw-r--r-- | source/nsswitch/winbindd_misc.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/nsswitch/winbindd_cm.c b/source/nsswitch/winbindd_cm.c index ba91239a739..b8b11b8466a 100644 --- a/source/nsswitch/winbindd_cm.c +++ b/source/nsswitch/winbindd_cm.c @@ -602,8 +602,8 @@ static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain, orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000); - werr = rpccli_netlogon_getdcname(netlogon_pipe, mem_ctx, our_domain->dcname, - domain->name, tmp); + werr = rpccli_netlogon_getanydcname(netlogon_pipe, mem_ctx, our_domain->dcname, + domain->name, tmp); /* And restore our original timeout. */ cli_set_timeout(netlogon_pipe->cli, orig_timeout); @@ -611,12 +611,12 @@ static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain, talloc_destroy(mem_ctx); if (!W_ERROR_IS_OK(werr)) { - DEBUG(10, ("rpccli_netlogon_getdcname failed: %s\n", + DEBUG(10, ("rpccli_netlogon_getanydcname failed: %s\n", dos_errstr(werr))); return False; } - /* cli_netlogon_getdcname gives us a name with \\ */ + /* cli_netlogon_getanydcname gives us a name with \\ */ p = tmp; if (*p == '\\') { p+=1; @@ -627,7 +627,7 @@ static BOOL get_dc_name_via_netlogon(const struct winbindd_domain *domain, fstrcpy(dcname, p); - DEBUG(10, ("rpccli_netlogon_getdcname returned %s\n", dcname)); + DEBUG(10, ("rpccli_netlogon_getanydcname returned %s\n", dcname)); if (!resolve_name(dcname, dc_ip, 0x20)) { return False; diff --git a/source/nsswitch/winbindd_misc.c b/source/nsswitch/winbindd_misc.c index ac751bf2a85..acb7dbf8a97 100644 --- a/source/nsswitch/winbindd_misc.c +++ b/source/nsswitch/winbindd_misc.c @@ -247,9 +247,9 @@ enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain, orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000); - werr = rpccli_netlogon_getdcname(netlogon_pipe, state->mem_ctx, domain->dcname, - state->request.domain_name, - dcname_slash); + werr = rpccli_netlogon_getanydcname(netlogon_pipe, state->mem_ctx, domain->dcname, + state->request.domain_name, + dcname_slash); /* And restore our original timeout. */ cli_set_timeout(netlogon_pipe->cli, orig_timeout); |