[Pkg-samba-maint] [samba] 05/07: Drop patch s3-smbd-fix-anonymous-authentication-if-signing-is- m.patch: fixed upstream.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch jessie
in repository samba.

commit 308cc0c5d22999ad5250b51cdbdbc0e77e6a790e
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Sun Sep 4 14:42:14 2016 +0000

    Drop patch s3-smbd-fix-anonymous-authentication-if-signing-is- m.patch: fixed upstream.
---
 debian/changelog                                   |  2 +
 ...-anonymous-authentication-if-signing-is-m.patch | 71 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d2f3f9..4943613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ samba (2:4.2.14+dfsg-0+deb8u1) UNRELEASED; urgency=high
     fixes.metze01.txt.
   * Drop patch sockets-with-htons.patch; applied upstream.
   * Drop patch CVE-2016-2110-NTLMSSP-regression.patch; fixed upstream.
+  * Drop patch s3-smbd-fix-anonymous-authentication-if-signing-is-
+    m.patch: fixed upstream.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 04 Sep 2016 14:21:35 +0000
 
diff --git a/debian/patches/s3-smbd-fix-anonymous-authentication-if-signing-is-m.patch b/debian/patches/s3-smbd-fix-anonymous-authentication-if-signing-is-m.patch
deleted file mode 100644
index 67f381a..0000000
--- a/debian/patches/s3-smbd-fix-anonymous-authentication-if-signing-is-m.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From bbde6e61580e030a84d2f0ce1e47d54dd51f5d10 Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <metze at samba.org>
-Date: Wed, 18 May 2016 09:56:02 +0200
-Subject: [PATCH] s3:smbd: fix anonymous authentication if signing is mandatory
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=11910
-
-Signed-off-by: Stefan Metzmacher <metze at samba.org>
-Reviewed-by: Andreas Schneider <asn at samba.org>
-
-Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
-Autobuild-Date(master): Wed May 18 15:49:46 CEST 2016 on sn-devel-144
-
-(cherry picked from commit aa5760433b219de7b41d35ca7ad6d4d702b89adf)
----
- source3/smbd/sesssetup.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
-index 77b8077..5d92af1 100644
---- a/source3/smbd/sesssetup.c
-+++ b/source3/smbd/sesssetup.c
-@@ -135,6 +135,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
- 	struct smbXsrv_connection *xconn = req->xconn;
- 	struct smbd_server_connection *sconn = req->sconn;
- 	uint16_t action = 0;
-+	bool is_authenticated = false;
- 	NTTIME now = timeval_to_nttime(&req->request_time);
- 	struct smbXsrv_session *session = NULL;
- 	uint16_t smb_bufsize = SVAL(req->vwv+2, 0);
-@@ -328,12 +329,13 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
- 		sconn->num_users++;
- 
- 		if (security_session_user_level(session_info, NULL) >= SECURITY_USER) {
-+			is_authenticated = true;
- 			session->compat->homes_snum =
- 				register_homes_share(session_info->unix_info->unix_name);
- 		}
- 
- 		if (srv_is_signing_negotiated(xconn) &&
--		    action == 0 &&
-+		    is_authenticated &&
- 		    session->global->signing_key.length > 0)
- 		{
- 			/*
-@@ -592,6 +594,7 @@ void reply_sesssetup_and_X(struct smb_request *req)
- 	struct auth_session_info *session_info = NULL;
- 	uint16 smb_flag2 = req->flags2;
- 	uint16_t action = 0;
-+	bool is_authenticated = false;
- 	NTTIME now = timeval_to_nttime(&req->request_time);
- 	struct smbXsrv_session *session = NULL;
- 	NTSTATUS nt_status;
-@@ -1029,12 +1032,13 @@ void reply_sesssetup_and_X(struct smb_request *req)
- 	sconn->num_users++;
- 
- 	if (security_session_user_level(session_info, NULL) >= SECURITY_USER) {
-+		is_authenticated = true;
- 		session->compat->homes_snum =
- 			register_homes_share(session_info->unix_info->unix_name);
- 	}
- 
- 	if (srv_is_signing_negotiated(xconn) &&
--	    action == 0 &&
-+	    is_authenticated &&
- 	    session->global->signing_key.length > 0)
- 	{
- 		/*
--- 
-1.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
index b8c08ee..4399ad9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,4 +20,3 @@ fix_pam_smbpass.patch
 disable-socketwrapper.diff
 unprivate-samba-debug.patch
 ctdb-Fix-detection-of-gnukfreebsd.patch
-s3-smbd-fix-anonymous-authentication-if-signing-is-m.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git