45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
|
From a0c6305f00fa61e48b79c1edd6de83fb8107e386 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Felix Zhang <fezhang@suse.com>
|
||
|
|
Date: Tue, 30 Aug 2016 20:03:35 +0800
|
||
|
|
Subject: [PATCH] disable 8 bpp vnc support
|
||
|
|
|
||
|
|
Xvnc drops support for 8 bpp since 1.4.0. Trying to launch Xvnc in
|
||
|
|
8 bpp will cause it to dump core (bsc#991059).
|
||
|
|
---
|
||
|
|
vnc/vnc.c | 9 ++++++---
|
||
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/vnc/vnc.c b/vnc/vnc.c
|
||
|
|
index bb04726..c3ee3bf 100644
|
||
|
|
--- a/vnc/vnc.c
|
||
|
|
+++ b/vnc/vnc.c
|
||
|
|
@@ -950,11 +950,14 @@ lib_mod_connect(struct vnc *v)
|
||
|
|
check_sec_result = 1;
|
||
|
|
|
||
|
|
/* only support 8 and 16 bpp connections from rdp client */
|
||
|
|
- if ((v->server_bpp != 8) && (v->server_bpp != 15) &&
|
||
|
|
+ if ((v->server_bpp != 15) &&
|
||
|
|
(v->server_bpp != 16) && (v->server_bpp != 24))
|
||
|
|
{
|
||
|
|
- v->server_msg(v, "VNC error - only supporting 8, 15, 16 and 24 bpp rdp "
|
||
|
|
+ v->server_msg(v, "VNC error - only supporting 15, 16 and 24 bpp "
|
||
|
|
"connections", 0);
|
||
|
|
+ if (v->server_bpp == 8)
|
||
|
|
+ v->server_msg(v, "VNC error - 8 bpp support is dropped "
|
||
|
|
+ "since Xvnc 1.4.0", 0);
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -985,7 +988,7 @@ lib_mod_connect(struct vnc *v)
|
||
|
|
v->server_msg(v, text, 0);
|
||
|
|
g_sleep(v->delay_ms);
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+
|
||
|
|
g_sprintf(text, "VNC connecting to %s %s", v->ip, con_port);
|
||
|
|
v->server_msg(v, text, 0);
|
||
|
|
error = g_tcp_connect(v->sck, v->ip, con_port);
|
||
|
|
--
|
||
|
|
2.6.6
|
||
|
|
|