svn commit: samba r6671 - in trunk/source/nsswitch: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-05-08 20:50:14 +0000 (Sun, 08 May 2005)
New Revision: 6671

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

Log:
More cleanup
Modified:
   trunk/source/nsswitch/winbindd_async.c
   trunk/source/nsswitch/winbindd_group.c
   trunk/source/nsswitch/winbindd_user.c
   trunk/source/nsswitch/winbindd_util.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_async.c
===================================================================
--- trunk/source/nsswitch/winbindd_async.c	2005-05-08 19:57:31 UTC (rev 6670)
+++ trunk/source/nsswitch/winbindd_async.c	2005-05-08 20:50:14 UTC (rev 6671)
@@ -694,7 +694,7 @@
 	state->cont = cont;
 	state->private = private;
 
-	domain = find_domain_from_sid(user_sid);
+	domain = find_domain_from_sid_noinit(user_sid);
 	if (domain == NULL) {
 		DEBUG(5, ("Could not find domain from SID %s\n",
 			  sid_string_static(user_sid)));

Modified: trunk/source/nsswitch/winbindd_group.c
===================================================================
--- trunk/source/nsswitch/winbindd_group.c	2005-05-08 19:57:31 UTC (rev 6670)
+++ trunk/source/nsswitch/winbindd_group.c	2005-05-08 20:50:14 UTC (rev 6671)
@@ -324,7 +324,7 @@
 
 	/* Fill in group structure */
 
-	domain = find_domain_from_sid(&group_sid);
+	domain = find_domain_from_sid_noinit(&group_sid);
 
 	if (!domain) {
 		DEBUG(1,("Can't find domain from sid\n"));
@@ -912,7 +912,7 @@
 	
 	/* Get info for the domain */
 
-	s->domain = find_domain_from_name(s->domname);
+	s->domain = find_domain_from_name_noinit(s->domname);
 
 	if (s->domain == NULL) {
 		DEBUG(7, ("could not find domain entry for domain %s\n", 
@@ -1099,14 +1099,14 @@
 	}
 
 	/* Get info for the domain */	
-	if ((domain = find_domain_from_sid(&user_sid)) == NULL) {
+	if ((domain = find_domain_from_sid_noinit(&user_sid)) == NULL) {
 		DEBUG(0,("could not find domain entry for sid %s\n", 
 			 sid_string_static(&user_sid)));
 		return WINBINDD_ERROR;
 	}
 
-	async_request(state->mem_ctx, &domain->child, &state->request,
-		      &state->response, request_finished_cont, state);
+	async_domain_request(state->mem_ctx, domain, &state->request,
+			     &state->response, request_finished_cont, state);
 	return WINBINDD_PENDING;
 }
 

Modified: trunk/source/nsswitch/winbindd_user.c
===================================================================
--- trunk/source/nsswitch/winbindd_user.c	2005-05-08 19:57:31 UTC (rev 6670)
+++ trunk/source/nsswitch/winbindd_user.c	2005-05-08 20:50:14 UTC (rev 6671)
@@ -175,7 +175,7 @@
 	}
 
 	s->state = state;
-	s->domain = find_domain_from_sid(sid);
+	s->domain = find_domain_from_sid_noinit(sid);
 	if (s->domain == NULL) {
 		DEBUG(3, ("Could not find domain for sid %s\n",
 			  sid_string_static(sid)));

Modified: trunk/source/nsswitch/winbindd_util.c
===================================================================
--- trunk/source/nsswitch/winbindd_util.c	2005-05-08 19:57:31 UTC (rev 6670)
+++ trunk/source/nsswitch/winbindd_util.c	2005-05-08 20:50:14 UTC (rev 6671)
@@ -214,8 +214,8 @@
 	request->length = sizeof(*request);
 	request->cmd = WINBINDD_LIST_TRUSTDOM;
 
-	async_request(mem_ctx, &domain->child, request, response,
-		      trustdom_recv, state);
+	async_domain_request(mem_ctx, domain, request, response,
+			     trustdom_recv, state);
 }
 
 static void trustdom_recv(void *private, BOOL success)
@@ -325,6 +325,7 @@
 	struct winbindd_request *request;
 	struct winbindd_response *response;
 	struct init_child_state *state;
+	struct winbindd_domain *our_domain;
 
 	mem_ctx = talloc_init("init_child_connection");
 	if (mem_ctx == NULL) {
@@ -369,8 +370,14 @@
 	request->cmd = WINBINDD_GETDCNAME;
 	fstrcpy(request->domain_name, domain->name);
 
-	async_request(mem_ctx, &find_our_domain()->child, request, response,
-		      init_child_getdc_recv, state);
+	our_domain = find_our_domain();
+	if (our_domain == NULL) {
+		DEBUG(5, ("Could not find our domain\n"));
+		return WINBINDD_ERROR;
+	}
+
+	async_domain_request(mem_ctx, our_domain, request, response,
+			     init_child_getdc_recv, state);
 	return WINBINDD_PENDING;
 }
 
@@ -655,7 +662,7 @@
 {
 	if (IS_DC || strequal(domain_name, "BUILTIN") ||
 	    strequal(domain_name, get_global_sam_name()))
-		return find_domain_from_name(domain_name);
+		return find_domain_from_name_noinit(domain_name);
 
 	return find_our_domain();
 }