From owner-svn-ports-all@freebsd.org Wed Mar 21 14:05:35 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E347BF6ABA0; Wed, 21 Mar 2018 14:05:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 92B5E71079; Wed, 21 Mar 2018 14:05:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D0652BA7F; Wed, 21 Mar 2018 14:05:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2LE5YRJ071575; Wed, 21 Mar 2018 14:05:34 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2LE5Yll071574; Wed, 21 Mar 2018 14:05:34 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201803211405.w2LE5Yll071574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Mar 2018 14:05:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465178 - head/net/freerdp/files X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/net/freerdp/files X-SVN-Commit-Revision: 465178 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2018 14:05:35 -0000 Author: kevans (src committer) Date: Wed Mar 21 14:05:34 2018 New Revision: 465178 URL: https://svnweb.freebsd.org/changeset/ports/465178 Log: Fix duplicated patch Approved by: brd (implicit) Modified: head/net/freerdp/files/patch-libfreerdp_core_nla.c Modified: head/net/freerdp/files/patch-libfreerdp_core_nla.c ============================================================================== --- head/net/freerdp/files/patch-libfreerdp_core_nla.c Wed Mar 21 14:04:05 2018 (r465177) +++ head/net/freerdp/files/patch-libfreerdp_core_nla.c Wed Mar 21 14:05:34 2018 (r465178) @@ -20,25 +20,3 @@ /* [1] negoTokens (NegoData) */ if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE) ---- libfreerdp/core/nla.c.orig 2018-03-21 03:26:15 UTC -+++ libfreerdp/core/nla.c -@@ -1663,14 +1663,18 @@ BOOL nla_send(rdpNla* nla) - static int nla_decode_ts_request(rdpNla* nla, wStream* s) - { - int length; -+ UINT32 version = 0; - - /* TSRequest */ - if (!ber_read_sequence_tag(s, &length) || - !ber_read_contextual_tag(s, 0, &length, TRUE) || -- !ber_read_integer(s, &nla->version)) -+ !ber_read_integer(s, &version)) - { - return -1; - } -+ -+ if (version < nla->version) -+ nla->version = version; - - /* [1] negoTokens (NegoData) */ - if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)