summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-10-19 13:32:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:33 -0500
commite070996cc365b72535131cf3b7925d2246918ba3 (patch)
tree760c82ba7f296c8ae7a26855f0cb721c94ed5d22
parentd273a2ef1d8ef366461638599dafd06826c5a949 (diff)
downloadsamba-e070996cc365b72535131cf3b7925d2246918ba3.tar.gz
samba-e070996cc365b72535131cf3b7925d2246918ba3.tar.bz2
samba-e070996cc365b72535131cf3b7925d2246918ba3.zip
r19413: Now we're calling init_dc_connection, this code
is completely useless (and in fact harmful :-) in that it causes a winbindd error where there should be none. Jeremy. (This used to be commit acf5419d62f4ac64449d4722c5ff3c9be35c0570)
-rw-r--r--source3/nsswitch/winbindd_util.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index b28d66e8bc..1486a20aae 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -450,8 +450,6 @@ static void init_child_recv(void *private_data, BOOL success)
enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domain,
struct winbindd_cli_state *state)
{
- struct in_addr ipaddr;
-
/* Ensure null termination */
state->request.domain_name
[sizeof(state->request.domain_name)-1]='\0';
@@ -462,20 +460,6 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai
fstrcpy(domain->dcname, state->request.data.init_conn.dcname);
}
- if (!domain->internal) {
- if (strlen(domain->dcname) > 0) {
- if (!resolve_name(domain->dcname, &ipaddr, 0x20)) {
- DEBUG(2, ("Could not resolve DC name %s for domain %s\n",
- domain->dcname, domain->name));
- return WINBINDD_ERROR;
- }
-
- domain->dcaddr.sin_family = PF_INET;
- putip((char *)&(domain->dcaddr.sin_addr), (char *)&ipaddr);
- domain->dcaddr.sin_port = 0;
- }
- }
-
init_dc_connection(domain);
#if 1