diff options
| -rw-r--r-- | source3/modules/gpfs.c | 20 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_gpfs.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c index e2a07661c98..de66a1e32ce 100644 --- a/source3/modules/gpfs.c +++ b/source3/modules/gpfs.c @@ -96,6 +96,16 @@ int gpfswrap_set_lease(int fd, unsigned int type) return gpfs_set_lease_fn(fd, type); } +int gpfswrap_getacl(char *pathname, int flags, void *acl) +{ + if (gpfs_getacl_fn == NULL) { + errno = ENOSYS; + return -1; + } + + return gpfs_getacl_fn(pathname, flags, acl); +} + bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access) { @@ -161,16 +171,6 @@ int set_gpfs_lease(int fd, int leasetype) return gpfswrap_set_lease(fd, gpfs_type); } -int smbd_gpfs_getacl(char *pathname, int flags, void *acl) -{ - if (gpfs_getacl_fn == NULL) { - errno = ENOSYS; - return -1; - } - - return gpfs_getacl_fn(pathname, flags, acl); -} - int smbd_gpfs_putacl(char *pathname, int flags, void *acl) { if (gpfs_putacl_fn == NULL) { diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 7d1ea88416a..79c0e2cd306 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -327,7 +327,7 @@ again: *len = size; errno = 0; - ret = smbd_gpfs_getacl(discard_const_p(char, fname), flags, aclbuf); + ret = gpfswrap_getacl(discard_const_p(char, fname), flags, aclbuf); if ((ret != 0) && (errno == ENOSPC)) { /* * get the size needed to accommodate the complete buffer diff --git a/source3/modules/vfs_gpfs.h b/source3/modules/vfs_gpfs.h index 6ceb5e01d93..83b54c5df55 100644 --- a/source3/modules/vfs_gpfs.h +++ b/source3/modules/vfs_gpfs.h @@ -30,10 +30,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); bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask, uint32 share_access); int set_gpfs_lease(int fd, int leasetype); -int smbd_gpfs_getacl(char *pathname, int flags, void *acl); int smbd_gpfs_putacl(char *pathname, int flags, void *acl); int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep, int *buflen); |