diff options
| author | Christof Schmitt <cs@samba.org> | 2014-12-10 15:11:18 -0700 |
|---|---|---|
| committer | Christof Schmitt <cs@samba.org> | 2015-03-02 22:31:07 +0100 |
| commit | 5fa1ee8b7b089c67fd2fb80dd312a9a7d19c8d29 (patch) | |
| tree | c5cc2d4bb10031f815a5fe9afb9cb416192f09f0 | |
| parent | d266ad1e4bcbd7d255aac8d798f332bf56be294d (diff) | |
| download | samba-5fa1ee8b7b089c67fd2fb80dd312a9a7d19c8d29.tar.gz samba-5fa1ee8b7b089c67fd2fb80dd312a9a7d19c8d29.tar.xz samba-5fa1ee8b7b089c67fd2fb80dd312a9a7d19c8d29.zip | |
gpfs: Rename wrapper for gpfs_putacl
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
| -rw-r--r-- | source3/modules/gpfs.c | 20 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 14 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.h | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c index de66a1e32c..e042a8993a 100644 --- a/source3/modules/gpfs.c +++ b/source3/modules/gpfs.c @@ -106,6 +106,16 @@ int gpfswrap_getacl(char *pathname, int flags, void *acl) return gpfs_getacl_fn(pathname, flags, acl); } +int gpfswrap_putacl(char *pathname, int flags, void *acl) +{ + if (gpfs_putacl_fn == NULL) { + errno = ENOSYS; + return -1; + } + + return gpfs_putacl_fn(pathname, flags, acl); +} + bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access) { @@ -171,16 +181,6 @@ int set_gpfs_lease(int fd, int leasetype) return gpfswrap_set_lease(fd, gpfs_type); } -int smbd_gpfs_putacl(char *pathname, int flags, void *acl) -{ - if (gpfs_putacl_fn == NULL) { - errno = ENOSYS; - return -1; - } - - return gpfs_putacl_fn(pathname, flags, acl); -} - int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length) { if (gpfs_ftruncate_fn == NULL) { diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 79c0e2cd30..a461fb3a11 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -646,8 +646,8 @@ static bool gpfsacl_process_smbacl(vfs_handle_struct *handle, if (gacl == NULL) { /* out of memory */ return False; } - ret = smbd_gpfs_putacl(fsp->fsp_name->base_name, - GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, gacl); + ret = gpfswrap_putacl(fsp->fsp_name->base_name, + GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, gacl); if ((ret != 0) && (errno == EINVAL)) { DEBUG(10, ("Retry without nfs41 control flags\n")); @@ -656,9 +656,9 @@ static bool gpfsacl_process_smbacl(vfs_handle_struct *handle, if (gacl == NULL) { /* out of memory */ return False; } - ret = smbd_gpfs_putacl(fsp->fsp_name->base_name, - GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, - gacl); + ret = gpfswrap_putacl(fsp->fsp_name->base_name, + GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, + gacl); } if (ret != 0) { @@ -1127,8 +1127,8 @@ static int gpfsacl_sys_acl_set_file(vfs_handle_struct *handle, return -1; } - result = smbd_gpfs_putacl(discard_const_p(char, name), - GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA, gpfs_acl); + result = gpfswrap_putacl(discard_const_p(char, name), + GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA, gpfs_acl); SAFE_FREE(gpfs_acl); return result; diff --git a/source3/modules/vfs_gpfs.h b/source3/modules/vfs_gpfs.h index 83b54c5df5..7f5d70cd57 100644 --- a/source3/modules/vfs_gpfs.h +++ b/source3/modules/vfs_gpfs.h @@ -31,10 +31,10 @@ int gpfswrap_init(void); int gpfswrap_set_share(int fd, unsigned int allow, unsigned int deny); int gpfswrap_set_lease(int fd, unsigned int type); int gpfswrap_getacl(char *pathname, int flags, void *acl); +int gpfswrap_putacl(char *pathname, int flags, void *acl); bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access); int set_gpfs_lease(int fd, int leasetype); -int smbd_gpfs_putacl(char *pathname, int flags, void *acl); int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep, int *buflen); int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs); |