svn commit: samba r19413 - in branches/SAMBA_3_0/source/nsswitch: .

jra at samba.org jra at samba.org
Thu Oct 19 13:32:01 GMT 2006


Author: jra
Date: 2006-10-19 13:32:00 +0000 (Thu, 19 Oct 2006)
New Revision: 19413

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19413

Log:
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.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-10-19 10:02:26 UTC (rev 19412)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-10-19 13:32:00 UTC (rev 19413)
@@ -450,8 +450,6 @@
 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 @@
 		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



More information about the samba-cvs mailing list