summaryrefslogtreecommitdiffstats
path: root/x11vnc/ssltools.h
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2010-02-22 22:33:50 -0500
committerrunge <runge@karlrunge.com>2010-02-22 22:33:50 -0500
commit521b9d98a4b772689061b24bcfd57dcce976aacc (patch)
treea0e4ed61ae608dd0bdca48d95d3e5960f46253c2 /x11vnc/ssltools.h
parent909683fd970fa842a12d2437ea30a624caf2e761 (diff)
downloadlibtdevnc-521b9d98a4b772689061b24bcfd57dcce976aacc.tar.gz
libtdevnc-521b9d98a4b772689061b24bcfd57dcce976aacc.zip
classes/ssl: Java SSL applet viewer now works with certificate chains.
x11vnc: Printout option -sslScripts. Suggest -auth guess in error message. Set fake_screen width and height. Test for +kb in Xvfb.
Diffstat (limited to 'x11vnc/ssltools.h')
-rw-r--r--x11vnc/ssltools.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h
index 855726a..a08ebb8 100644
--- a/x11vnc/ssltools.h
+++ b/x11vnc/ssltools.h
@@ -2078,7 +2078,10 @@ char create_display[] =
" sarg=\"screen\"\n"
" fi\n"
" fi\n"
-" margs=\"+kb\"\n"
+" margs=\"\"\n"
+" if $have_Xvfb -help 2>&1 | grep '^\\+kb[ ].*Keyboard Extension' >/dev/null; then\n"
+" margs=\"+kb\"\n"
+" fi\n"
"\n"
" # currently not enabled in Xvfb's we see.\n"
"# if $have_Xvfb -extension MOOMOO 2>&1 | grep -w RANDR >/dev/null; then\n"