[prev in list] [next in list] [prev in thread] [next in thread] 

List:       samba-technical
Subject:    Re: Bug in lookupname_recv() in nsswitch/winbindd_async.c
From:       "Bo Yang" <boyang () novell ! com>
Date:       2008-01-30 5:23:04
Message-ID: 47A0A469020000EE0003352C () victor ! provo ! novell ! com
[Download RAW message or body]

Hi, Jeremy:
     Here is the patch for v3-0-test and v3-0-stable.
     
     Please review it.

Thanks

Best
       Regards
BoYang
1.29



> > > Jeremy Allison <jra@samba.org> 01/29/08 4:54 PM >>>
On Mon, Jan 28, 2008 at 09:33:54PM -0700, Bo Yang wrote:
> Hi, All:
> 
> I found out that this bug was fixed in v3-2-test and v3-2-stable, should it be \
> backported to v3-0-test/stable?

Yes, probably for the 3.0.28a release. If you send me a patch I'll
look at it.

Thanks,

Jeremy.


["getgroups_lookupname_recv.diff" (application/octet-stream)]

diff --git a/source/nsswitch/winbindd_async.c b/source/nsswitch/winbindd_async.c
index 32d4e66..a29f74d 100644
--- a/source/nsswitch/winbindd_async.c
+++ b/source/nsswitch/winbindd_async.c
@@ -782,6 +782,14 @@ enum winbindd_result winbindd_dual_lookupsid(struct winbindd_domain *domain,
  This is the second callback after contacting the forest root
 ********************************************************************/
 
+struct lookupname_state {
+	char *dom_name;
+	char *name;
+	void *caller_private_data;
+};
+
+
+
 static void lookupname_recv2(TALLOC_CTX *mem_ctx, BOOL success,
 			    struct winbindd_response *response,
 			    void *c, void *private_data)
@@ -826,36 +834,32 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, BOOL success,
 		     enum lsa_SidType type) =
 		(void (*)(void *, BOOL, const DOM_SID *, enum lsa_SidType))c;
 	DOM_SID sid;
+	struct lookupname_state *s = talloc_get_type_abort(private_data, struct lookupname_state);
 
 	if (!success) {
 		DEBUG(5, ("lookupname_recv: lookup_name() failed!\n"));
-		cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+		cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
 		return;
 	}
 
 	if (response->result != WINBINDD_OK) {
 		/* Try again using the forest root */
 		struct winbindd_domain *root_domain = find_root_domain();
-		struct winbindd_cli_state *state = (struct winbindd_cli_state*)private_data;		
 		struct winbindd_request request;		
-		char *name_domain, *name_account;
 		
 		if ( !root_domain ) {
 			DEBUG(5,("lookupname_recv: unable to determine forest root\n"));
-			cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+			cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
 			return;
 		}
 
-		name_domain  = state->request.data.name.dom_name;
-		name_account = state->request.data.name.name;	
-
 		ZERO_STRUCT(request);
 		request.cmd = WINBINDD_LOOKUPNAME;
-		fstrcpy(request.data.name.dom_name, name_domain);
-		fstrcpy(request.data.name.name, name_account);
+		fstrcpy(request.data.name.dom_name, s->dom_name);
+		fstrcpy(request.data.name.name, s->name);
 
 		do_async_domain(mem_ctx, root_domain, &request, lookupname_recv2,
-				(void *)cont, private_data);
+				(void *)cont, (void *)s->caller_private_data);
 
 		return;
 	}
@@ -863,11 +867,11 @@ static void lookupname_recv(TALLOC_CTX *mem_ctx, BOOL success,
 	if (!string_to_sid(&sid, response->data.sid.sid)) {
 		DEBUG(0, ("Could not convert string %s to sid\n",
 			  response->data.sid.sid));
-		cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+		cont(s->caller_private_data, False, NULL, SID_NAME_UNKNOWN);
 		return;
 	}
 
-	cont(private_data, True, &sid,
+	cont(s->caller_private_data, True, &sid,
 	     (enum lsa_SidType)response->data.sid.type);
 }
 
@@ -886,6 +890,7 @@ void winbindd_lookupname_async(TALLOC_CTX *mem_ctx,
 {
 	struct winbindd_request request;
 	struct winbindd_domain *domain;
+	struct lookupname_state *s;
 
 	if ( (domain = find_lookup_domain_from_name(dom_name)) == NULL ) {
 		DEBUG(5, ("Could not find domain for name %s\n", dom_name));
@@ -898,8 +903,18 @@ void winbindd_lookupname_async(TALLOC_CTX *mem_ctx,
 	fstrcpy(request.data.name.dom_name, dom_name);
 	fstrcpy(request.data.name.name, name);
 
+	if ((s = TALLOC_ZERO_P(mem_ctx, struct lookupname_state)) == NULL) {
+		DEBUG(0, ("winbindd_lookupname_async: talloc lookupname_state failed!\n"));
+		cont(private_data, False, NULL, SID_NAME_UNKNOWN);
+		return;
+	}
+
+	s->dom_name = talloc_strdup(s, dom_name);
+	s->name     = talloc_strdup(s, name);
+	s->caller_private_data = private_data;
+
 	do_async_domain(mem_ctx, domain, &request, lookupname_recv,
-			(void *)cont, private_data);
+			(void *)cont, (void *)s);
 }
 
 enum winbindd_result winbindd_dual_lookupname(struct winbindd_domain *domain,


[prev in list] [next in list] [prev in thread] [next in thread]