From: Volker Lendecke <vl@samba.org>
Date: Fri, 9 Jan 2026 09:24:32 +0000 (+0100)
Subject: lib: Replace calls to [set|drop]_effective_capability
X-Git-Tag: tdb-1.4.15~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15ce51212bf237f81685f78002efd5df3b60e5e1;p=thirdparty%2Fsamba.git

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 8f99911df40..841be979f07 100644
--- 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 3317d520e23..edd01ddabc4 100644
--- 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 1943fe9f20b..08e8c691feb 100644
--- 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);