[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Fri Sep 14 04:24:02 MDT 2012


The branch, master has been updated
       via  1aa281e s3: fix the hpux acl module
       via  9222f0f s3: fix the tru64 acl module
       via  35632ee s3: fix the aix acl module
      from  4a8cbe2 WHATSNEW: Fix some issues in the release notes.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1aa281ecb0f45c97d78161fd1308be8655295f1f
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Sep 14 10:01:33 2012 +0200

    s3: fix the hpux acl module
    
    This was not adopted to the recent VFS acl structure changes.
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Fri Sep 14 12:23:23 CEST 2012 on sn-devel-104

commit 9222f0f9280485c2751ecfdb96421da25e6e5344
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Sep 14 09:40:07 2012 +0200

    s3: fix the tru64 acl module
    
    This was not adopted to the recent VFS acl structure changes.

commit 35632eec8e3b0dcfecffde814a790cc4f444dd97
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Sep 14 09:35:53 2012 +0200

    s3: fix the aix acl module
    
    This was not adopted to the recent VFS acl structure changes.

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_aixacl_util.c |   18 +++++++++---------
 source3/modules/vfs_hpuxacl.c     |   10 +++++-----
 source3/modules/vfs_tru64acl.c    |   10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c
index fb13866..82e8bd1 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -27,7 +27,7 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
 	struct acl_entry *acl_entry;
 	struct ace_id *idp;
 	
-	struct smb_acl_t *result = sys_acl_init(0);
+	struct smb_acl_t *result = sys_acl_init();
 	struct smb_acl_entry *ace;
 	int i;
 	
@@ -78,15 +78,15 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
 							
 			switch(ace->a_type) {
 			case ACEID_USER: {
-			ace->uid = idp->id_data[0];
-			DEBUG(10,("case ACEID_USER ace->uid is %d\n",ace->uid));
+			ace->info.user.uid = idp->id_data[0];
+			DEBUG(10,("case ACEID_USER ace->info.user.uid is %d\n",ace->info.user.uid));
 			ace->a_type = SMB_ACL_USER;
 			break;
 			}
 		
 			case ACEID_GROUP: {
-			ace->gid = idp->id_data[0];
-			DEBUG(10,("case ACEID_GROUP ace->gid is %d\n",ace->gid));
+			ace->info.group.gid = idp->id_data[0];
+			DEBUG(10,("case ACEID_GROUP ace->info.group.gid is %d\n",ace->info.group.gid));
 			ace->a_type = SMB_ACL_GROUP;
 			break;
 			}
@@ -149,9 +149,9 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
 			
 		ace = &result->acl[result->count];
 		
-		ace->uid = 0;
-		ace->gid = 0;
-		DEBUG(10,("ace->uid = %d\n",ace->uid));
+		ace->info.user.uid = 0;
+		ace->info.group.gid = 0;
+		DEBUG(10,("ace->info.user.uid = %d\n",ace->info.user.uid));
 		
 		switch(i) {
 		case 2:
@@ -287,7 +287,7 @@ struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
 		ace_id->id_type = (smb_entry->a_type==SMB_ACL_GROUP) ? ACEID_GROUP : ACEID_USER;
 		DEBUG(10,("The id type is %d\n",ace_id->id_type));
 		ace_id->id_len = sizeof(struct ace_id); /* contains 1 id_data */
-		ace_id->id_data[0] = (smb_entry->a_type==SMB_ACL_GROUP) ? smb_entry->gid : smb_entry->uid;
+		ace_id->id_data[0] = (smb_entry->a_type==SMB_ACL_GROUP) ? smb_entry->info.group.gid : smb_entry->info.user.uid;
 	}
 
 	return file_acl;
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index f8661b1..884cc5c 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -436,13 +436,13 @@ static bool smb_acl_to_hpux_acl(SMB_ACL_T smb_acl,
 		switch(hpux_entry.a_type) {
 		case USER:
 			DEBUG(10, ("got tag type USER with uid %d\n", 
-				   smb_entry->uid));
-			hpux_entry.a_id = (uid_t)smb_entry->uid;
+				   smb_entry->info.user.uid));
+			hpux_entry.a_id = (uid_t)smb_entry->info.user.uid;
 			break;
 		case GROUP:
 			DEBUG(10, ("got tag type GROUP with gid %d\n", 
-				   smb_entry->gid));
-			hpux_entry.a_id = (uid_t)smb_entry->gid;
+				   smb_entry->info.group.gid));
+			hpux_entry.a_id = (uid_t)smb_entry->info.group.gid;
 			break;
 		default:
 			break;
@@ -495,7 +495,7 @@ static SMB_ACL_T hpux_acl_to_smb_acl(HPUX_ACL_T hpux_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;
 	}
diff --git a/source3/modules/vfs_tru64acl.c b/source3/modules/vfs_tru64acl.c
index 09f8c39..918f7c6 100644
--- a/source3/modules/vfs_tru64acl.c
+++ b/source3/modules/vfs_tru64acl.c
@@ -160,7 +160,7 @@ static struct smb_acl_t *tru64_acl_to_smb_acl(const struct acl *tru64_acl)
 
 	DEBUG(10, ("Hi! This is tru64_acl_to_smb_acl.\n"));
 	
-	if ((result = sys_acl_init(0)) == NULL) {
+	if ((result = sys_acl_init()) == NULL) {
 		DEBUG(0, ("sys_acl_init() failed in tru64_acl_to_smb_acl\n"));
 		errno = ENOMEM;
 		goto fail;
@@ -299,23 +299,23 @@ static acl_t smb_acl_to_tru64_acl(const SMB_ACL_T smb_acl)
 		switch (smb_entry->a_type) {
 		case SMB_ACL_USER:
 			if (acl_set_qualifier(tru64_entry, 
-						(int *)&smb_entry->uid) != 0) 
+						(int *)&smb_entry->info.user.uid) != 0) 
 			{
 				DEBUG(3, ("acl_set_qualifier failed: %s\n",
 					strerror(errno)));
 				goto fail;
 			}
-			DEBUGADD(10, (" - setting uid to %d\n", smb_entry->uid));
+			DEBUGADD(10, (" - setting uid to %d\n", smb_entry->info.user.uid));
 			break;
 		case SMB_ACL_GROUP:
 			if (acl_set_qualifier(tru64_entry, 
-						(int *)&smb_entry->gid) != 0)
+						(int *)&smb_entry->info.group.gid) != 0)
 			{
 				DEBUG(3, ("acl_set_qualifier failed: %s\n",
 					strerror(errno)));
 				goto fail;
 			}
-			DEBUGADD(10, (" - setting gid to %d\n", smb_entry->gid));
+			DEBUGADD(10, (" - setting gid to %d\n", smb_entry->info.group.gid));
 			break;
 		default:
 			break;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list