25727003 Upgrade Samba to 4.4.13
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 15 Mar 2017 10:30:53 -0700
changeset 7840 6eb80902a873
parent 7839 d2c617295be6
child 7841 d2c207b77abb
25727003 Upgrade Samba to 4.4.13 25833834 problem in UTILITY/SAMBA
components/samba/Makefile
components/samba/patches/25511645.patch
--- a/components/samba/Makefile	Mon Apr 03 01:42:38 2017 -0700
+++ b/components/samba/Makefile	Wed Mar 15 10:30:53 2017 -0700
@@ -41,9 +41,9 @@
 export PARFAIT_BUILD=no
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	4.4.8
-TPNO=			33007
-COMPONENT_ARCHIVE_HASH= sha256:0e54de8a22b77f9712578029639331b51f818b70e194766c98475a5b99470fbf
+COMPONENT_VERSION=	4.4.13
+TPNO=			34132
+COMPONENT_ARCHIVE_HASH= sha256:61558009408e4f37d79c2b5f9c49cf7633908e12a14141e1c075c67011fa0d2d
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
--- a/components/samba/patches/25511645.patch	Mon Apr 03 01:42:38 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-This patch is taken from community bug:
-https://bugzilla.samba.org/show_bug.cgi?id=12505
-
-From 35493fe89b7674c9c05932146059fe253fee22bb Mon Sep 17 00:00:00 2001
-From: Stefan Metzmacher <[email protected]>
-Date: Wed, 28 Oct 2015 12:16:05 +0100
-Subject: [PATCH] s3:librpc: remove bigendian argument from
- dcerpc_pull_ncacn_packet()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We should get this from the packet itself.
-
-Signed-off-by: Stefan Metzmacher <[email protected]>
-Reviewed-by: G√ľnther Deschner <[email protected]>
-Reviewed-by: Andreas Schneider <[email protected]>
-(cherry picked from commit 1bfba2c5161c0e27f8c27301f258360aedf1b018)
----
- source3/librpc/rpc/dcerpc.h         | 3 +--
- source3/librpc/rpc/dcerpc_helpers.c | 9 ++++-----
- source3/rpc_client/cli_pipe.c       | 3 +--
- 3 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
-index 1838012..f58ef4c 100644
---- a/source3/librpc/rpc/dcerpc.h
-+++ b/source3/librpc/rpc/dcerpc.h
[email protected]@ -61,8 +61,7 @@ NTSTATUS dcerpc_push_ncacn_packet(TALLOC_CTX *mem_ctx,
- 				  DATA_BLOB *blob);
- NTSTATUS dcerpc_pull_ncacn_packet(TALLOC_CTX *mem_ctx,
- 				  const DATA_BLOB *blob,
--				  struct ncacn_packet *r,
--				  bool bigendian);
-+				  struct ncacn_packet *r);
- NTSTATUS dcerpc_push_dcerpc_auth(TALLOC_CTX *mem_ctx,
- 				 enum dcerpc_AuthType auth_type,
- 				 enum dcerpc_AuthLevel auth_level,
-diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
-index aab43a1..11b445f 100644
---- a/source3/librpc/rpc/dcerpc_helpers.c
-+++ b/source3/librpc/rpc/dcerpc_helpers.c
[email protected]@ -88,14 +88,12 @@ NTSTATUS dcerpc_push_ncacn_packet(TALLOC_CTX *mem_ctx,
- *			elements
- * @param blob		The blob of data to decode
- * @param r		An empty ncacn_packet, must not be NULL
--* @param bigendian	Whether the packet is bignedian encoded
- *
- * @return a NTSTATUS error code
- */
- NTSTATUS dcerpc_pull_ncacn_packet(TALLOC_CTX *mem_ctx,
- 				  const DATA_BLOB *blob,
--				  struct ncacn_packet *r,
--				  bool bigendian)
-+				  struct ncacn_packet *r)
- {
- 	enum ndr_err_code ndr_err;
- 	struct ndr_pull *ndr;
[email protected]@ -104,11 +102,12 @@ NTSTATUS dcerpc_pull_ncacn_packet(TALLOC_CTX *mem_ctx,
- 	if (!ndr) {
- 		return NT_STATUS_NO_MEMORY;
- 	}
--	if (bigendian) {
-+
-+	if (!(CVAL(ndr->data, DCERPC_DREP_OFFSET) & DCERPC_DREP_LE)) {
- 		ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
- 	}
- 
--	if (CVAL(blob->data, DCERPC_PFC_OFFSET) & DCERPC_PFC_FLAG_OBJECT_UUID) {
-+	if (CVAL(ndr->data, DCERPC_PFC_OFFSET) & DCERPC_PFC_FLAG_OBJECT_UUID) {
- 		ndr->flags |= LIBNDR_FLAG_OBJECT_PRESENT;
- 	}
- 
-diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
-index 97f4944..3b2eff5 100644
---- a/source3/rpc_client/cli_pipe.c
-+++ b/source3/rpc_client/cli_pipe.c
[email protected]@ -948,8 +948,7 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
- 
- 	status = dcerpc_pull_ncacn_packet(state->pkt,
- 					  &state->incoming_frag,
--					  state->pkt,
--					  !state->endianess);
-+					  state->pkt);
- 	if (!NT_STATUS_IS_OK(status)) {
- 		/*
- 		 * TODO: do a real async disconnect ...
--- 
-1.9.1
-