The branch, master has been updated via 51ea39c s3-vfs: fix the build of nfs4_acls.c from 0fd69f5 s3-waf: Link smbd against RPCECHO.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 51ea39c5c87aa78949b32ee6a549de22385f73c1 Author: Günther Deschner <g...@samba.org> Date: Sun Sep 26 21:04:39 2010 +0200 s3-vfs: fix the build of nfs4_acls.c Guenther ----------------------------------------------------------------------- Summary of changes: source3/modules/nfs4_acls.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index f8a61c9..7e5f994 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -20,6 +20,7 @@ #include "includes.h" #include "nfs4_acls.h" #include "librpc/gen_ndr/ndr_security.h" +#include "../libcli/security/dom_sid.h" #include "include/dbwrap.h" #undef DBGC_CLASS @@ -567,7 +568,7 @@ static bool smbacl4_fill_ace4( DEBUG(9, ("ace_v4->aceMask(0x%x)!=ace_nt->access_mask(0x%x)\n", ace_v4->aceMask, ace_nt->access_mask)); - if (sid_equal(&ace_nt->trustee, &global_sid_World)) { + if (dom_sid_equal(&ace_nt->trustee, &global_sid_World)) { ace_v4->who.special_id = SMB_ACE4_WHO_EVERYONE; ace_v4->flags |= SMB_ACE4_ID_SPECIAL; } else { -- Samba Shared Repository