diff options
| author | runge <runge> | 2006-03-12 05:50:01 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-03-12 05:50:01 +0000 |
| commit | e2e9347946bbaf1bf87c571d4a1fd9115fe90954 (patch) | |
| tree | e58c0b2d9dcddf0a8d2f90930119945020cb1f5c /x11vnc/tkx11vnc.h | |
| parent | 5e72609631a1893acfe6a31d0129553ed3044a20 (diff) | |
| download | libtdevnc-e2e9347946bbaf1bf87c571d4a1fd9115fe90954.tar.gz libtdevnc-e2e9347946bbaf1bf87c571d4a1fd9115fe90954.zip | |
x11vnc: add -ssl mode using libssl. Include Xdummy in misc.
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index 506eda3..bcf171f 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -260,6 +260,8 @@ char gui_code[] = ""; " =GA tail-logfile\n" " quiet\n" " --\n" +" =GA show-start-cmd\n" +" =DG debug_gui\n" " =GAL Misc-Debug::\n" " debug_xevents\n" " debug_xdamage\n" @@ -270,8 +272,6 @@ char gui_code[] = ""; " debug_sel\n" " dbg\n" " =GAL LOFF\n" -" =GA show-start-cmd\n" -" =DG debug_gui\n" "\n" "Permissions\n" " =DRQA lock\n" @@ -300,19 +300,22 @@ char gui_code[] = ""; " unixpw_nis_list:\n" " =0 storepasswd\n" " =GAL LOFF\n" -" =GAL Safe::\n" +" =GAL SSL::\n" +" ssl\n" +" =F ssl_pem:\n" +" stunnel\n" +" =F stunnel_pem:\n" +" =F sslverify:\n" +" =GAL LOFF\n" +" =GAL Misc-Perms::\n" " safer\n" " unsafe\n" " =RA noremote\n" -" =GAL LOFF\n" -" =GAL Misc-Perms::\n" " =0S alwaysshared\n" " =0S nevershared\n" " =0S dontdisconnect\n" " =SQA deny_all\n" " timeout:\n" -" stunnel\n" -" =F stunnel_pem:\n" " =GAL LOFF\n" "\n" "Tuning\n" @@ -581,6 +584,10 @@ char gui_code[] = ""; "Set the -stunnel pem filename value.\n" "\"\n" "\n" +" set helptext(ssl_pem) \"\n" +"Set the -ssl pem filename value.\n" +"\"\n" +"\n" " set helptext(wireframe_mode) \"\n" "Set the -wireframe mode string value.\n" "\"\n" @@ -799,6 +806,17 @@ char gui_code[] = ""; "with -rfbauth, but only with -passwdfile, -passwd, and -viewpasswd.\n" "\"\n" "\n" +" set helptext(SSL:) \"\n" +"In this sub-menu we provide the options related to SSL encrpytion\n" +"and authentication.\n" +"\n" +"There is a built-in mode (-ssl) using the OpenSSL library, and a 2nd\n" +"using the external stunnel program (-stunnel, that needs to be installed\n" +"on the system). Either may require or benefit from having PEM certificate\n" +"files specified.\n" +"\n" +"\"\n" +"\n" " set helptext(Misc-Perms:) \"\n" "In this sub-menu we provide some lesser used permission options.\n" "\n" @@ -5595,6 +5613,8 @@ char gui_code[] = ""; " set nitem \"unixpw_nis\"\n" " } elseif {$nitem == \"stunnel_pem\"} {\n" " set nitem \"stunnel\"\n" +" } elseif {$nitem == \"ssl_pem\"} {\n" +" set nitem \"ssl\"\n" " } elseif {$nitem == \"wireframe_mode\"} {\n" " set nitem \"wireframe\"\n" " } elseif {$nitem == \"solid_color\"} {\n" |