lib: Replace calls to [set|drop]_effective_capability

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 8f99911df40efb8defbaf9c75abbbedb1d96a05c..841be979f074fe6bcecf41c5ca348ba933642aa5 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -124,13 +124,13 @@ static int fstatat_with_cap_dac_override(int fd,
 {
        int ret;
 
-       set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+       set_dac_override_capability(true);
        ret = sys_fstatat(fd,
                          pathname,
                          sbuf,
                          flags,
                          fake_dir_create_times);
-       drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+       set_dac_override_capability(false);
 
        return ret;
 }
@@ -197,9 +197,9 @@ static int fstat_with_cap_dac_override(int fd, SMB_STRUCT_STAT *sbuf,
 {
        int ret;
 
-       set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+       set_dac_override_capability(true);
        ret = sys_fstat(fd, sbuf, fake_dir_create_times);
-       drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+       set_dac_override_capability(false);
 
        return ret;
 }

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 3317d520e239fe6931f7477f64ce00eadb5b9480..edd01ddabc4a92050a6a315e954d57a700e7e6a2 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -422,12 +422,12 @@ static int gpfs_getacl_with_capability(struct files_struct *fsp,
 {
        int ret, saved_errno;
 
-       set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+       set_dac_override_capability(true);
 
        ret = gpfswrap_fgetacl(fsp_get_pathref_fd(fsp), flags, buf);
        saved_errno = errno;
 
-       drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+       set_dac_override_capability(false);
 
        errno = saved_errno;
        return ret;
@@ -1458,7 +1458,7 @@ static int vfs_gpfs_get_winattrs_helper(
                 * open a file implies FILE_LIST_DIRECTORY.
                 */
 
-               set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+               set_dac_override_capability(true);
 
                ret = gpfswrap_get_winattrs(
                        fsp_get_pathref_fd(fd),
@@ -1466,7 +1466,7 @@ static int vfs_gpfs_get_winattrs_helper(
 
                saved_errno = errno;
 
-               drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+               set_dac_override_capability(false);
 
                errno = saved_errno;
        }
@@ -1768,14 +1768,14 @@ static NTSTATUS vfs_gpfs_fget_dos_attributes(struct vfs_handle_struct *handle,
                 * open a file implies FILE_LIST_DIRECTORY.
                 */
 
-               set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+               set_dac_override_capability(true);
 
                ret = gpfswrap_get_winattrs(fsp_get_pathref_fd(fsp), &attrs);
                if (ret == -1) {
                        saved_errno = errno;
                }
 
-               drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+               set_dac_override_capability(false);
 
                if (saved_errno != 0) {
                        errno = saved_errno;

diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c
index 1943fe9f20b43cbe10382199611f14b865b7adde..08e8c691febaed8655f573abf78e26d6f9963e97 100644 (file)
--- a/source3/smbd/dmapi.c
+++ b/source3/smbd/dmapi.c
@@ -147,7 +147,7 @@ static int dmapi_init_session(struct smbd_dmapi_context *ctx)
        }
 
        if (ctx->session != DM_NO_SESSION) {
-               set_effective_capability(DMAPI_ACCESS_CAPABILITY);
+               set_dmapi_capability(true);
        }
 
        /*
@@ -308,7 +308,7 @@ uint32_t dmapi_file_flags(const char * const path)
                 * can re-acquire them if necessary.
                 */
 
-               set_effective_capability(DMAPI_ACCESS_CAPABILITY);
+               set_dmapi_capability(true);
 
                err = dm_path_to_handle(discard_const_p(char, path),
                        &dm_handle, &dm_handle_len);