[Pkg-samba-maint] [samba] 02/12: Adapt patches to 4.5.8

[Mathieu Parent]

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

sathieu pushed a commit to branch stretch-security
in repository samba.

commit 34f93fcb466e496010d791a9290d4e44bb1436af
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Sep 19 17:51:23 2017 +0200

    Adapt patches to 4.5.8
    
    See 0d0d9820531aca17a5300f4e4eb47f07a999aaca
---
 debian/patches/CVE-2017-12151-v4-5.patches.metze02.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/CVE-2017-12151-v4-5.patches.metze02.txt b/debian/patches/CVE-2017-12151-v4-5.patches.metze02.txt
index dad5895..3411745 100644
--- a/debian/patches/CVE-2017-12151-v4-5.patches.metze02.txt
+++ b/debian/patches/CVE-2017-12151-v4-5.patches.metze02.txt
@@ -38,7 +38,7 @@ index 2b53a93..e675f95 100644
 +
  bool cli_state_has_tcon(struct cli_state *cli)
  {
- 	uint32_t tid;
+ 	uint16_t tid = cli_state_get_tid(cli);
 diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
 index 340cd22..f276b74 100644
 --- a/source3/libsmb/proto.h
@@ -49,8 +49,8 @@ index 340cd22..f276b74 100644
  uint32_t cli_getpid(struct cli_state *cli);
 +bool cli_state_is_encryption_on(struct cli_state *cli);
  bool cli_state_has_tcon(struct cli_state *cli);
- uint32_t cli_state_get_tid(struct cli_state *cli);
- uint32_t cli_state_set_tid(struct cli_state *cli, uint32_t tid);
+ uint16_t cli_state_get_tid(struct cli_state *cli);
+ uint16_t cli_state_set_tid(struct cli_state *cli, uint16_t tid);
 -- 
 1.9.1
 

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