[SCM] Samba Shared Repository - branch master updated
Ira Cooper
ira at samba.org
Thu Sep 13 21:22:01 MDT 2012
The branch, master has been updated
via 5e51f63 s3: Fix the vfs_solarisacl module to compile.
from 88a5bff packaging: apply some solaris packaging fixes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5e51f63e86ab0855daf9e822d48a12134bfb6f26
Author: Ira Cooper <ira at samba.org>
Date: Fri Sep 14 01:32:45 2012 +0000
s3: Fix the vfs_solarisacl module to compile.
This got broken with the recent VFS acl structure changes.
Autobuild-User(master): Ira Cooper <ira at samba.org>
Autobuild-Date(master): Fri Sep 14 05:21:29 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_solarisacl.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index ff9f1a6..10b6f70 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -370,13 +370,13 @@ static bool smb_acl_to_solaris_acl(SMB_ACL_T smb_acl,
switch(solaris_entry.a_type) {
case USER:
DEBUG(10, ("got tag type USER with uid %u\n",
- (unsigned int)smb_entry->uid));
- solaris_entry.a_id = (uid_t)smb_entry->uid;
+ (unsigned int)smb_entry->info.user.uid));
+ solaris_entry.a_id = (uid_t)smb_entry->info.user.uid;
break;
case GROUP:
DEBUG(10, ("got tag type GROUP with gid %u\n",
- (unsigned int)smb_entry->gid));
- solaris_entry.a_id = (uid_t)smb_entry->gid;
+ (unsigned int)smb_entry->info.group.gid));
+ solaris_entry.a_id = (uid_t)smb_entry->info.group.gid;
break;
default:
break;
@@ -429,7 +429,7 @@ static SMB_ACL_T solaris_acl_to_smb_acl(SOLARIS_ACL_T solaris_acl, int count,
SMB_ACL_T result;
int i;
- if ((result = sys_acl_init(0)) == NULL) {
+ if ((result = sys_acl_init()) == NULL) {
DEBUG(10, ("error allocating memory for SMB_ACL\n"));
goto fail;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list