[arch-commits] Commit in samba/trunk (3 files)

[Tobias Powalowski]

    Date: Wednesday, April 27, 2022 @ 20:46:19
  Author: tpowa
Revision: 444142

upgpkg: samba 4.16.0-6: fix FS#74259

Added:
  samba/trunk/34771e1931587807d0395c7ac7f4be18654997f4.patch
Modified:
  samba/trunk/PKGBUILD
Deleted:
  samba/trunk/70b9977a46e5242174b4461a7f49d5f640c1db62.patch

------------------------------------------------+
 34771e1931587807d0395c7ac7f4be18654997f4.patch |   43 +++++++++++++++++++++++
 70b9977a46e5242174b4461a7f49d5f640c1db62.patch |   41 ---------------------
 PKGBUILD                                       |    6 +--
 3 files changed, 46 insertions(+), 44 deletions(-)

Added: 34771e1931587807d0395c7ac7f4be18654997f4.patch
===================================================================
--- 34771e1931587807d0395c7ac7f4be18654997f4.patch	                        (rev 0)
+++ 34771e1931587807d0395c7ac7f4be18654997f4.patch	2022-04-27 20:46:19 UTC (rev 444142)
@@ -0,0 +1,43 @@
+From 34771e1931587807d0395c7ac7f4be18654997f4 Mon Sep 17 00:00:00 2001
+From: Elia Geretto <elia.f.geretto at gmail.com>
+Date: Fri, 11 Mar 2022 19:32:30 +0100
+Subject: [PATCH] s3:libsmb: Fix errno for failed authentication in
+ SMBC_server_internal()
+
+In SMBC_server_internal(), when authentication fails, the errno value is
+currently hard-coded to EPERM, while it should be EACCES instead. Use the
+NT_STATUS map to set the appropriate value.
+
+This bug was found because it breaks listing printers protected by
+authentication in GNOME Control Panel.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14983
+
+Signed-off-by: Elia Geretto <elia.f.geretto at gmail.com>
+Reviewed-by: Jeremy Allison <jra at samba.org>
+Reviewed-by: Volker Lendecke <vl at samba.org>
+
+Autobuild-User(master): Jeremy Allison <jra at samba.org>
+Autobuild-Date(master): Wed Mar 16 19:44:18 UTC 2022 on sn-devel-184
+
+(cherry picked from commit 70b9977a46e5242174b4461a7f49d5f640c1db62)
+---
+ source3/libsmb/libsmb_server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
+index b92477c88fe..09d27868c0e 100644
+--- a/source3/libsmb/libsmb_server.c
++++ b/source3/libsmb/libsmb_server.c
+@@ -572,7 +572,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
+ 		    !NT_STATUS_IS_OK(cli_session_setup_anon(c))) {
+ 
+                         cli_shutdown(c);
+-                        errno = EPERM;
++			errno = map_errno_from_nt_status(status);
+                         return NULL;
+                 }
+ 	}
+-- 
+GitLab
+

Deleted: 70b9977a46e5242174b4461a7f49d5f640c1db62.patch
===================================================================
--- 70b9977a46e5242174b4461a7f49d5f640c1db62.patch	2022-04-27 20:38:54 UTC (rev 444141)
+++ 70b9977a46e5242174b4461a7f49d5f640c1db62.patch	2022-04-27 20:46:19 UTC (rev 444142)
@@ -1,41 +0,0 @@
-From 70b9977a46e5242174b4461a7f49d5f640c1db62 Mon Sep 17 00:00:00 2001
-From: Elia Geretto <elia.f.geretto at gmail.com>
-Date: Fri, 11 Mar 2022 19:32:30 +0100
-Subject: [PATCH] s3:libsmb: Fix errno for failed authentication in
- SMBC_server_internal()
-
-In SMBC_server_internal(), when authentication fails, the errno value is
-currently hard-coded to EPERM, while it should be EACCES instead. Use the
-NT_STATUS map to set the appropriate value.
-
-This bug was found because it breaks listing printers protected by
-authentication in GNOME Control Panel.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14983
-
-Signed-off-by: Elia Geretto <elia.f.geretto at gmail.com>
-Reviewed-by: Jeremy Allison <jra at samba.org>
-Reviewed-by: Volker Lendecke <vl at samba.org>
-
-Autobuild-User(master): Jeremy Allison <jra at samba.org>
-Autobuild-Date(master): Wed Mar 16 19:44:18 UTC 2022 on sn-devel-184
----
- source3/libsmb/libsmb_server.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
-index b92477c88fe..09d27868c0e 100644
---- a/source3/libsmb/libsmb_server.c
-+++ b/source3/libsmb/libsmb_server.c
-@@ -572,7 +572,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
- 		    !NT_STATUS_IS_OK(cli_session_setup_anon(c))) {
- 
-                         cli_shutdown(c);
--                        errno = EPERM;
-+			errno = map_errno_from_nt_status(status);
-                         return NULL;
-                 }
- 	}
--- 
-GitLab
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-27 20:38:54 UTC (rev 444141)
+++ PKGBUILD	2022-04-27 20:46:19 UTC (rev 444142)
@@ -29,7 +29,7 @@
         samba.logrotate
         samba.pam
         samba.conf
-        70b9977a46e5242174b4461a7f49d5f640c1db62.patch)
+        34771e1931587807d0395c7ac7f4be18654997f4.patch)
 validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs at samba.org>
 sha512sums=('cea6bab64021779d217669e58612d192b907c2c481ef30e40e449bc6b8f8993a9b7b7b5bfcfebe54d8f70b8f720893cfa77a9d674ef8e07dd45a55a0fbc673e2'
             'SKIP'
@@ -36,12 +36,12 @@
             '2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
             '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
             'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc'
-            'a453d171c5335a457b1a4b1107460e723458c215258d330bdfc50084de15b66f15aa05e7386c1f976cc8634c8410213ac85831b9d6a61cc8b2a166e5c8303278')
+            'ee60e1d16241698fa4e66fbb97d4a08c6ccf8f03a1ce17b855bd0ca47b546747d67a01c89330072833949ec1ab8d7fd713c7370613b24e777f158c141195cd53')
 ### UNINSTALL dmapi package before building!!!
 
 prepare () {
   cd samba-${pkgver}
-  patch -Np1 -i ../70b9977a46e5242174b4461a7f49d5f640c1db62.patch
+  patch -Np1 -i ../34771e1931587807d0395c7ac7f4be18654997f4.patch
 }
 
 build() {