sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

gpfs: Rename wrapper for gpfs_putacl

Browse Source 
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
This commit is contained in:
Christof Schmitt 2014-12-10 15:11:18 -07:00
parent d266ad1e4b
commit 5fa1ee8b7b
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/modules/gpfs.c
View File

@ -106,6 +106,16 @@ int gpfswrap_getacl(char *pathname, int flags, void *acl)
return gpfs_getacl_fn(pathname, flags, 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, bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
uint32 share_access) uint32 share_access)
{ {
@ -171,16 +181,6 @@ int set_gpfs_lease(int fd, int leasetype)
return gpfswrap_set_lease(fd, gpfs_type); 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) int smbd_gpfs_ftruncate(int fd, gpfs_off64_t length)
{ {
if (gpfs_ftruncate_fn == NULL) { if (gpfs_ftruncate_fn == NULL) {

14
source3/modules/vfs_gpfs.c
View File

@ -646,8 +646,8 @@ static bool gpfsacl_process_smbacl(vfs_handle_struct *handle,
if (gacl == NULL) { /* out of memory */ if (gacl == NULL) { /* out of memory */
return False; return False;
} }
ret = smbd_gpfs_putacl(fsp->fsp_name->base_name, ret = gpfswrap_putacl(fsp->fsp_name->base_name,
GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, gacl); GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, gacl);
if ((ret != 0) && (errno == EINVAL)) { if ((ret != 0) && (errno == EINVAL)) {
DEBUG(10, ("Retry without nfs41 control flags\n")); 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 */ if (gacl == NULL) { /* out of memory */
return False; return False;
} }
ret = smbd_gpfs_putacl(fsp->fsp_name->base_name, ret = gpfswrap_putacl(fsp->fsp_name->base_name,
GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA, GPFS_PUTACL_STRUCT | GPFS_ACL_SAMBA,
gacl); gacl);
} }
if (ret != 0) { if (ret != 0) {
@ -1127,8 +1127,8 @@ static int gpfsacl_sys_acl_set_file(vfs_handle_struct *handle,
return -1; return -1;
} }
result = smbd_gpfs_putacl(discard_const_p(char, name), result = gpfswrap_putacl(discard_const_p(char, name),
GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA, gpfs_acl); GPFS_PUTACL_STRUCT|GPFS_ACL_SAMBA, gpfs_acl);
SAFE_FREE(gpfs_acl); SAFE_FREE(gpfs_acl);
return result; return result;

2
source3/modules/vfs_gpfs.h
View File

@ -31,10 +31,10 @@ int gpfswrap_init(void);
int gpfswrap_set_share(int fd, unsigned int allow, unsigned int deny); int gpfswrap_set_share(int fd, unsigned int allow, unsigned int deny);
int gpfswrap_set_lease(int fd, unsigned int type); int gpfswrap_set_lease(int fd, unsigned int type);
int gpfswrap_getacl(char *pathname, int flags, void *acl); 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, bool set_gpfs_sharemode(files_struct *fsp, uint32 access_mask,
uint32 share_access); uint32 share_access);
int set_gpfs_lease(int fd, int leasetype); 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 smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep,
int *buflen); int *buflen);
int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs); int smbd_fget_gpfs_winattrs(int fd, struct gpfs_winattr *attrs);