kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/freerdp: Fix following recent Windows update, bump dependents

Browse source 
Patch backported from upstream @ fbe01c7; breakage seems to be that FreeRDP
will emit an error "ERRCONNECT_PASSWORD_CERTAINLY_EXPIRED" in a context
where one is certain that that is not the case.

PR:		226651
Approved by:	brd (ports), me (maintainer)
This commit is contained in:
Kyle Evans 2018-03-21 14:04:05 +00:00
parent 2e3cb773fa
commit 1a1f12d394
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=465177
4 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/freerdp/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= freerdp
DISTVERSION= 2.0.0-rc1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net comms ipv6
MAINTAINER= kevans@FreeBSD.org

44
net/freerdp/files/patch-libfreerdp_core_nla.c Normal file
View file

@ -0,0 +1,44 @@
--- 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)
--- 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)

2
net/remmina-plugin-rdp/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PKGNAMESUFFIX= -rdp
PORTREVISION= 1
PORTREVISION= 2
COMMENT= Remmina plugin for RDP protocol

2
net/vinagre/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= vinagre
PORTVERSION= 3.18.2
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3