diff options
| author | Christian Ambach <ambi@samba.org> | 2012-10-12 11:45:59 +0200 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2012-10-12 11:49:32 +0200 |
| commit | fa728d1c0b6583c7d11b5540a8d13942a14701f4 (patch) | |
| tree | b63f01660e39dbce542310dee649310e4c3beb5c | |
| parent | e4946cf10cdc112aaa61291442ce29690fe1c105 (diff) | |
| download | samba-fa728d1c0b6583c7d11b5540a8d13942a14701f4.tar.gz samba-fa728d1c0b6583c7d11b5540a8d13942a14701f4.tar.bz2 samba-fa728d1c0b6583c7d11b5540a8d13942a14701f4.zip | |
s3:vfs_gpfs fix the build
make it compile again after the recent (untested) additions of the acl_blob functions
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 2d8ac5cd66..ba751b9403 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -365,7 +365,8 @@ static NTSTATUS gpfsacl_fget_nt_acl(vfs_handle_struct *handle, return NT_STATUS_INTERNAL_ERROR); if (!config->acl) { - return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc); + return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, + mem_ctx, ppdesc); } result = gpfs_get_nfs4_acl(fsp->fsp_name->base_name, &pacl); @@ -398,7 +399,8 @@ static NTSTATUS gpfsacl_get_nt_acl(vfs_handle_struct *handle, return NT_STATUS_INTERNAL_ERROR); if (!config->acl) { - return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc); + return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, + mem_ctx, ppdesc); } result = gpfs_get_nfs4_acl(name, &pacl); @@ -718,16 +720,18 @@ static int gpfsacl_sys_acl_blob_get_file(vfs_handle_struct *handle, const char * DATA_BLOB *blob) { struct gpfs_config_data *config; + SMB4ACL_T *pacl = NULL; + int result; SMB_VFS_HANDLE_GET_DATA(handle, config, struct gpfs_config_data, - return NULL); + return -1); if (!config->acl) { return SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, mem_ctx, blob_description, blob); } - result = gpfs_get_nfs4_acl(name, &pacl); + result = gpfs_get_nfs4_acl(path_p, &pacl); if (result == 0) { /* We don't have a way to linearlise the NFS4 ACL * right now, and it is much closer to the NT ACL @@ -746,10 +750,12 @@ static int gpfsacl_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct * DATA_BLOB *blob) { struct gpfs_config_data *config; + SMB4ACL_T *pacl = NULL; + int result; SMB_VFS_HANDLE_GET_DATA(handle, config, struct gpfs_config_data, - return NULL); + return -1); if (!config->acl) { return SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FD(handle, fsp, mem_ctx, blob_description, blob); |