svn commit: r465178 - head/net/freerdp/files
Kyle Evans
kevans at FreeBSD.org
Wed Mar 21 14:05:35 UTC 2018
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)
More information about the svn-ports-all
mailing list