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

Revert "vfs_recycle.c: prefer capabilities over become_root"

This reverts commit 4227b011f6ada97a4cd72a440ed887ffdb3f219e.

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_recycle.c b/source3/modules/vfs_recycle.c
index a9d60f6adbb..327a7eea06e 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -401,10 +401,10 @@ static void recycle_do_touch(vfs_handle_struct *handle,
 	/* mtime */
 	ft.mtime = touch_mtime ? ft.atime : smb_fname_tmp->st.st_ex_mtime;
 
-	set_effective_capability(DAC_OVERRIDE_CAPABILITY);
+	become_root();
 	ret = SMB_VFS_NEXT_FNTIMES(handle, smb_fname_tmp->fsp, &ft);
 	err = errno;
-	drop_effective_capability(DAC_OVERRIDE_CAPABILITY);
+	unbecome_root();
 	if (ret == -1 ) {
 		DEBUG(0, ("recycle: touching %s failed, reason = %s\n",
 			  smb_fname_str_dbg(smb_fname_tmp), strerror(err)));