Hold off on 3.2.2 release please.

[Jeremy Allison]

On Thu, Aug 14, 2008 at 05:03:39PM -0700, Jeremy Allison wrote:
> I'm tracking a potential show-stopper with Herb w.r.t. group
> membership order in smbd when using winbindd to auth.
> 
> I'll post more when I have more info. Herb is also looking
> into this tonight.

Ok, here's the patch that works for Herb so I don't lose it. I'm
going to check this in later tonight with a full explaination.

Jeremy.
-------------- next part --------------
diff --git a/source/nsswitch/libwbclient/wbc_pam.c b/source/nsswitch/libwbclient/wbc_pam.c
index 5427ddb..76a4a65 100644
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@ -104,7 +104,7 @@ static wbcErr wbc_create_auth_info(TALLOC_CTX *mem_ctx,
 	i->home_drive	= talloc_strdup(i, resp->data.auth.info3.dir_drive);
 	BAIL_ON_PTR_ERROR(i->home_drive, wbc_status);
 
-	i->num_sids	= 2;
+	i->num_sids	= 3;
 	i->num_sids 	+= resp->data.auth.info3.num_groups;
 	i->num_sids	+= resp->data.auth.info3.num_other_sids;
 
@@ -135,6 +135,10 @@ static wbcErr wbc_create_auth_info(TALLOC_CTX *mem_ctx,
 		     resp->data.auth.info3.group_rid,
 		     0);
 	sn++;
+	_SID_COMPOSE(i->sids[sn], domain_sid,
+		     resp->data.auth.info3.group_rid,
+		     0);
+	sn++;
 
 	p = (char *)resp->extra_data.data;
 	if (!p) {
@@ -161,6 +165,10 @@ static wbcErr wbc_create_auth_info(TALLOC_CTX *mem_ctx,
 			BAIL_ON_WBC_ERROR(wbc_status);
 		}
 
+		if (rid == resp->data.auth.info3.group_rid) {
+			continue;
+		}
+
 		_SID_COMPOSE(i->sids[sn], domain_sid,
 			     rid, attrs);
 		sn++;