[SCM] Samba Shared Repository - branch master updated

[Stefan (metze) Metzmacher]

Hi Matthias,

> The branch, master has been updated
>        via  7a5e47b s4:auth/sam.c-"authsam_expand_nested_groups" - don't fail if we've memberships on non-SAM objects

> diff --git a/source4/auth/sam.c b/source4/auth/sam.c
> index b98830a..6203b96 100644
> --- a/source4/auth/sam.c
> +++ b/source4/auth/sam.c
> @@ -326,11 +326,11 @@ NTSTATUS authsam_expand_nested_groups(struct ldb_context *sam_ctx,
>  
>  	status = dsdb_get_extended_dn_sid(dn, &sid, "SID");
>  	if (!NT_STATUS_IS_OK(status)) {
> -		DEBUG(0, (__location__ ": when parsing DN %s we failed to find our SID component, so we cannot calculate the group token: %s\n",
> -			  ldb_dn_get_extended_linearized(tmp_ctx, dn, 1), 
> -			  nt_errstr(status)));
> +		/* If we fail finding a SID then this is no error since it could
> +		 * be a non SAM object - e.g. a group with object class
> +		 * "groupOfNames" */
>  		talloc_free(tmp_ctx);
> -		return NT_STATUS_INTERNAL_DB_CORRUPTION;
> +		return NT_STATUS_OK;
>  	}

Wouldn't it be better to just catch a specific error code
(NT_STATUS_OBJECT_NAME_NOT_FOUND)
rather than all failures?

metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20101203/cacbf845/attachment.pgp>