[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-969-g1ddd10b

[Jeremy Allison]

The branch, master has been updated
       via  1ddd10b56aea663b06768638d83e3bdcfea9ec89 (commit)
      from  1d75a6e2245c022e2688d5fa6807d572fa18bcd6 (commit)

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


- Log -----------------------------------------------------------------
commit 1ddd10b56aea663b06768638d83e3bdcfea9ec89
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Aug 12 10:58:00 2009 -0700

    Fix some warnings in the AIX ACL code.
    Jeremy.

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

Summary of changes:
 source3/modules/vfs_aixacl_util.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c
index b2329fe..2d84f03 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -38,8 +38,8 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
 
 
 	
-	DEBUG(10,("acl_entry is %d\n",acl_entry));
-	DEBUG(10,("acl_last(file_acl) id %d\n",acl_last(file_acl)));
+	DEBUG(10,("acl_entry is %p\n",(void *)acl_entry));
+	DEBUG(10,("acl_last(file_acl) id %p\n",(void *)acl_last(file_acl)));
 
 	/* Check if the extended acl bit is on.   *
 	 * If it isn't, do not show the           *
@@ -124,7 +124,7 @@ SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
 			ace->a_perm |= (ace->a_perm & S_IXUSR) ? SMB_ACL_EXECUTE : 0;
 			DEBUG(10,("ace->a_perm is %d\n",ace->a_perm));
 			
-			DEBUG(10,("acl_entry = %d\n",acl_entry));
+			DEBUG(10,("acl_entry = %p\n",(void *)acl_entry));
 			DEBUG(10,("The ace_type is %d\n",acl_entry->ace_type));
  
 			acl_entry = acl_nxt(acl_entry);
@@ -210,7 +210,6 @@ struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
 	struct acl_entry *acl_entry = NULL;
 	struct ace_id *ace_id = NULL;
 	unsigned int id_type;
-	unsigned int user_id;
 	unsigned int acl_length;
 	int	i;
  


-- 
Samba Shared Repository