From: Björn Jacke <bjacke@samba.org>
Date: Mon, 25 Mar 2024 16:03:57 +0000 (+0100)
Subject: Revert "vfs_default.c: prefer capabilities over become_root"
X-Git-Tag: tdb-1.4.11~1361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ad635b2705bcfc8166bd90b1ad35ebb9cbc986;p=thirdparty%2Fsamba.git

Revert "vfs_default.c: prefer capabilities over become_root"

This reverts commit 62464bd2db2a95b1253364f4493bbb6770b73193.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15583
Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 98188a50c34..62ad5063af0 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1897,14 +1897,14 @@ static void vfswrap_get_dos_attributes_getxattr_done(struct tevent_req *subreq)
 
 		state->as_root = true;
 
-		set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+		become_root();
 		subreq = SMB_VFS_GETXATTRAT_SEND(state,
 						 state->ev,
 						 state->dir_fsp,
 						 state->smb_fname,
 						 SAMBA_XATTR_DOS_ATTRIB,
 						 sizeof(fstring));
-		drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+		unbecome_root();
 		if (tevent_req_nomem(subreq, req)) {
 			return;
 		}