[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: Revert "s3/smbd/open.c:smbd_calculate_access_mask_fsp: lower "rejected by...

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
76a81e0a by Michael Tokarev at 2023-02-12T20:24:38+03:00
Revert "s3/smbd/open.c:smbd_calculate_access_mask_fsp: lower "rejected by share acces" message from ERR to DEBUG"

This reverts commit d1cfe6d143c5d6776cfa55efcd643c139b3a165f.
Slipped to debian/master by mistake

- - - - -
a209af58 by Michael Tokarev at 2023-02-12T20:26:01+03:00
s3-smbd-open.c-smbd_calculate_access_mask_fsp-lower-.patch

- - - - -


3 changed files:

- + debian/patches/s3-smbd-open.c-smbd_calculate_access_mask_fsp-lower-.patch
- debian/patches/series
- source3/smbd/open.c


Changes:

=====================================
debian/patches/s3-smbd-open.c-smbd_calculate_access_mask_fsp-lower-.patch
=====================================
@@ -0,0 +1,38 @@
+From d1cfe6d143c5d6776cfa55efcd643c139b3a165f Mon Sep 17 00:00:00 2001
+From: Michael Tokarev <mjt at tls.msk.ru>
+Date: Wed, 8 Feb 2023 00:02:44 +0300
+Subject: s3/smbd/open.c:smbd_calculate_access_mask_fsp: lower "rejected by share acces" message from ERR to DEBUG
+
+Signed-off-by: Michael Tokarev <mjt at tls.msk.ru>
+---
+ source3/smbd/open.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/source3/smbd/open.c b/source3/smbd/open.c
+index c24c55d6a76..73a087f94c3 100644
+--- a/source3/smbd/open.c
++++ b/source3/smbd/open.c
+@@ -3389,13 +3389,13 @@ NTSTATUS smbd_calculate_access_mask_fsp(struct files_struct *dirfsp,
+ 	rejected_share_access = access_mask & ~(fsp->conn->share_access);
+ 
+ 	if (rejected_share_access) {
+-		DBG_ERR("Access denied on file %s: "
+-			"rejected by share access mask[0x%08X] "
+-			"orig[0x%08X] mapped[0x%08X] reject[0x%08X]\n",
+-			fsp_str_dbg(fsp),
+-			fsp->conn->share_access,
+-			orig_access_mask, access_mask,
+-			rejected_share_access);
++		DBG_DEBUG("Access denied on file %s: "
++			  "rejected by share access mask[0x%08X] "
++			  "orig[0x%08X] mapped[0x%08X] reject[0x%08X]\n",
++			  fsp_str_dbg(fsp),
++			  fsp->conn->share_access,
++			  orig_access_mask, access_mask,
++			  rejected_share_access);
+ 		return NT_STATUS_ACCESS_DENIED;
+ 	}
+ 
+-- 
+2.30.2
+


=====================================
debian/patches/series
=====================================
@@ -23,3 +23,4 @@ fruit-disable-useless-size_t-overflow-check.patch
 meaningful-error-if-no-samba-ad-provision.patch
 meaningful-error-if-no-python3-markdown.patch
 ctdb-use-run-instead-of-var-run.patch
+s3-smbd-open.c-smbd_calculate_access_mask_fsp-lower-.patch


=====================================
source3/smbd/open.c
=====================================
@@ -3389,13 +3389,13 @@ NTSTATUS smbd_calculate_access_mask_fsp(struct files_struct *dirfsp,
 	rejected_share_access = access_mask & ~(fsp->conn->share_access);
 
 	if (rejected_share_access) {
-		DBG_DEBUG("Access denied on file %s: "
-			  "rejected by share access mask[0x%08X] "
-			  "orig[0x%08X] mapped[0x%08X] reject[0x%08X]\n",
-			  fsp_str_dbg(fsp),
-			  fsp->conn->share_access,
-			  orig_access_mask, access_mask,
-			  rejected_share_access);
+		DBG_ERR("Access denied on file %s: "
+			"rejected by share access mask[0x%08X] "
+			"orig[0x%08X] mapped[0x%08X] reject[0x%08X]\n",
+			fsp_str_dbg(fsp),
+			fsp->conn->share_access,
+			orig_access_mask, access_mask,
+			rejected_share_access);
 		return NT_STATUS_ACCESS_DENIED;
 	}
 



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/8b69cdf73949c0eca279d6479889c759f9336941...a209af5874449dea2bce68ff34d67ce74cf21fc4

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/8b69cdf73949c0eca279d6479889c759f9336941...a209af5874449dea2bce68ff34d67ce74cf21fc4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20230212/5bc8e398/attachment-0001.htm>