2017-05-27 20:13:35 +02:00
|
|
|
From: Fuminobu TAKEYAMA <ftake@geeko.jp>
|
|
|
|
Date: Mon, 01 May 2017 08:13:41 +0000
|
2016-09-21 13:37:09 +02:00
|
|
|
Subject: [PATCH] disable 8 bpp vnc support
|
|
|
|
|
2017-05-27 20:13:35 +02:00
|
|
|
Refresh the patch from Felix Zhang
|
|
|
|
|
2016-09-21 13:37:09 +02:00
|
|
|
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).
|
|
|
|
---
|
2017-05-27 20:13:35 +02:00
|
|
|
vnc/vnc.c | 8 ++++++--
|
|
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
2016-09-21 13:37:09 +02:00
|
|
|
|
|
|
|
diff --git a/vnc/vnc.c b/vnc/vnc.c
|
2017-05-27 20:13:35 +02:00
|
|
|
index b0eb29b3..db593da0 100644
|
2016-09-21 13:37:09 +02:00
|
|
|
--- a/vnc/vnc.c
|
|
|
|
+++ b/vnc/vnc.c
|
2017-05-27 20:13:35 +02:00
|
|
|
@@ -1011,15 +1011,19 @@ lib_mod_connect(struct vnc *v)
|
|
|
|
/* check if bpp is supported for rdp connection */
|
|
|
|
switch (v->server_bpp)
|
2016-09-21 13:37:09 +02:00
|
|
|
{
|
2017-05-27 20:13:35 +02:00
|
|
|
- case 8:
|
|
|
|
case 15:
|
|
|
|
case 16:
|
|
|
|
case 24:
|
|
|
|
case 32:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
- v->server_msg(v, "VNC error - only supporting 8, 15, 16, 24 and 32 "
|
|
|
|
+ v->server_msg(v, "VNC error - only supporting 15, 16, 24 and 32 "
|
|
|
|
"bpp rdp connections", 0);
|
|
|
|
+ if (v->server_bpp == 8)
|
|
|
|
+ {
|
|
|
|
+ v->server_msg(v, "VNC error - 8 bpp support is dropped "
|
|
|
|
+ "since Xvnc 1.4.0", 0);
|
|
|
|
+ }
|
2016-09-21 13:37:09 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|