Author: jra Date: 2006-08-04 01:09:57 +0000 (Fri, 04 Aug 2006) New Revision: 17393
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17393 Log: Remove Volker's ASSERT that num_groupsids > 0. For guest connection they may well be zero. This should fix up the buildfarm (fingers crossed). Jeremy. Modified: branches/SAMBA_3_0/source/auth/auth_util.c branches/SAMBA_3_0_23/source/auth/auth_util.c Changeset: Modified: branches/SAMBA_3_0/source/auth/auth_util.c =================================================================== --- branches/SAMBA_3_0/source/auth/auth_util.c 2006-08-04 00:00:15 UTC (rev 17392) +++ branches/SAMBA_3_0/source/auth/auth_util.c 2006-08-04 01:09:57 UTC (rev 17393) @@ -829,9 +829,11 @@ add_sid_to_array(result, user_sid, &result->user_sids, &result->num_sids); - SMB_ASSERT(num_groupsids > 0); - add_sid_to_array(result, &groupsids[0], - &result->user_sids, &result->num_sids); + /* For guest, num_groupsids may be zero. */ + if (num_groupsids) { + add_sid_to_array(result, &groupsids[0], + &result->user_sids, &result->num_sids); + } /* Add in BUILTIN sids */ Modified: branches/SAMBA_3_0_23/source/auth/auth_util.c =================================================================== --- branches/SAMBA_3_0_23/source/auth/auth_util.c 2006-08-04 00:00:15 UTC (rev 17392) +++ branches/SAMBA_3_0_23/source/auth/auth_util.c 2006-08-04 01:09:57 UTC (rev 17393) @@ -829,9 +829,11 @@ add_sid_to_array(result, user_sid, &result->user_sids, &result->num_sids); - SMB_ASSERT(num_groupsids > 0); - add_sid_to_array(result, &groupsids[0], - &result->user_sids, &result->num_sids); + /* For guest, num_groupsids may be zero. */ + if (num_groupsids) { + add_sid_to_array(result, &groupsids[0], + &result->user_sids, &result->num_sids); + } /* Add in BUILTIN sids */