[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  b620140 vfs_gpfs: Fix compile error in gpfsacl_sys_acl_set_fd
      from  1f4b07e s4:torture: Fix comparison between pointer and zero character constant

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


- Log -----------------------------------------------------------------
commit b6201407a346a376e215f4303e55bbdf8febd5df
Author: Christof Schmitt <cs at samba.org>
Date:   Fri Jun 2 16:16:16 2017 -0700

    vfs_gpfs: Fix compile error in gpfsacl_sys_acl_set_fd
    
    ../source3/modules/vfs_gpfs.c: In function ‘gpfsacl_sys_acl_set_fd’:
    ../source3/modules/vfs_gpfs.c:1280:6: error: passing argument 2 of ‘gpfsacl_sys_acl_set_file’ from incompatible pointer type [-Werror]
          SMB_ACL_TYPE_ACCESS, theacl);
          ^
    ../source3/modules/vfs_gpfs.c:1235:12: note: expected ‘const struct smb_filename *’ but argument is of type ‘char *’
     static int gpfsacl_sys_acl_set_file(vfs_handle_struct *handle,
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Jun  3 05:52:32 CEST 2017 on sn-devel-144

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

Summary of changes:
 source3/modules/vfs_gpfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 4dc9f76..aeb0836 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1276,7 +1276,7 @@ static int gpfsacl_sys_acl_set_fd(vfs_handle_struct *handle,
 		return SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
 	}
 
-	return gpfsacl_sys_acl_set_file(handle, fsp->fsp_name->base_name,
+	return gpfsacl_sys_acl_set_file(handle, fsp->fsp_name,
 					SMB_ACL_TYPE_ACCESS, theacl);
 }
 


-- 
Samba Shared Repository