[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-1827-g4df33ec
Volker Lendecke
vlendec at samba.org
Wed May 27 09:54:43 GMT 2009
The branch, master has been updated
via 4df33ec4a79c171097ea7ba7542e093ef5034863 (commit)
via a8ffc286a4fd3fffcc934462b9f6f5593f910661 (commit)
from d5e3d9478dcb2feed44287f67eeab39e49eed2ac (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4df33ec4a79c171097ea7ba7542e093ef5034863
Author: Volker Lendecke <vl at samba.org>
Date: Sun May 24 22:17:58 2009 +0200
Fix the build of nfs4_acls.c
commit a8ffc286a4fd3fffcc934462b9f6f5593f910661
Author: Volker Lendecke <vl at samba.org>
Date: Sun May 24 22:16:34 2009 +0200
Fix a size_t/int warning
-----------------------------------------------------------------------
Summary of changes:
source3/modules/nfs4_acls.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 04ea73f..10a3733 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -316,7 +316,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
}
DEBUG(10, ("smb_get_nt_acl_nfs4_common successfully exited with sd_size %d\n",
- ndr_size_security_descriptor(*ppdesc, NULL, 0)));
+ (int)ndr_size_security_descriptor(*ppdesc, NULL, 0)));
return NT_STATUS_OK;
}
@@ -760,7 +760,8 @@ NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
return NT_STATUS_OK;
}
- theacl = smbacl4_win2nfs4(fsp->fsp_name, psd->dacl, ¶ms, sbuf.st_uid, sbuf.st_gid);
+ theacl = smbacl4_win2nfs4(fsp->fsp_name, psd->dacl, ¶ms,
+ sbuf.st_ex_uid, sbuf.st_ex_gid);
if (!theacl)
return map_nt_error_from_unix(errno);
--
Samba Shared Repository
More information about the samba-cvs
mailing list