diff options
| author | runge <runge> | 2008-12-10 17:12:27 +0000 |
|---|---|---|
| committer | runge <runge> | 2008-12-10 17:12:27 +0000 |
| commit | 8bef644d17f62ea6daf7459b863f05de187966fe (patch) | |
| tree | 5137fbbab354ccfe29622a99c3d913c558d1c87a /x11vnc/ssltools.h | |
| parent | e68192915936e173b887856a019d4a54ba96069c (diff) | |
| download | libtdevnc-8bef644d17f62ea6daf7459b863f05de187966fe.tar.gz libtdevnc-8bef644d17f62ea6daf7459b863f05de187966fe.zip | |
x11vnc: 0.9.6 release. Some strtok bugfixes. rename -tlsvnc
to -anontls. Disable ssl caching. No cert creation prompting
in inetd or bg modes. waitpid a bit more carefully on ssl
helpers. Tune ssl initial timeouts. Let -create user specify
starting X display. fix -rfbport prompt gui for older tk.
-sslonly option. Error if no -ssl with related options. -rand
option. -ssl implies -ssl SAVE
Diffstat (limited to 'x11vnc/ssltools.h')
| -rw-r--r-- | x11vnc/ssltools.h | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index 4d7f251..57b3806 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -394,7 +394,7 @@ char genCert[] = " else\n" " echo \"the key and pretend to be your VNC client. The downside is it is\"\n" " fi\n" -" echo \"inconvenient because you will have to supply the passphrase every\"\n" +" echo \"inconvenient because you will need to supply the passphrase EVERY\"\n" " if [ \"x$type\" = \"xserver\" ]; then\n" " echo \"time you start x11vnc using this key.\"\n" " else\n" @@ -402,9 +402,24 @@ char genCert[] = " fi\n" " echo \"\"\n" " if [ \"X$GENCERT_NOPROMPT\" = \"X\" ]; then\n" -" printf \"Protect key with a passphrase? [y]/n \"\n" -" read x\n" +" x=\"\"\n" +" for tp in 1 2 3\n" +" do\n" +" printf \"Protect key with a passphrase? y/n \"\n" +" read x\n" +" x=`echo \"$x\" | tr 'A-Z' 'a-z' | sed -e 's/[ ]//g'`\n" +" if [ \"X$x\" = \"Xy\" -o \"X$x\" = \"Xn\" ]; then\n" +" break;\n" +" else \n" +" echo \"Please reply with \\\"y\\\" or \\\"n\\\".\"\n" +" fi\n" +" done\n" +" if [ \"X$x\" != \"Xy\" -a \"X$x\" != \"Xn\" ]; then\n" +" echo \"Assuming reply \\\"n\\\".\"\n" +" x=n\n" +" fi\n" " else\n" +" echo \"NOT protecting private key with passphrase.\"\n" " x=n\n" " fi\n" " estr=\" *unencrypted*\"\n" @@ -1273,12 +1288,17 @@ char create_display[] = "\n" "findfree() {\n" " try=20\n" +" sry=99\n" +" if [ \"X$X11VNC_CREATE_STARTING_DISPLAY_NUMBER\" != \"X\" ]; then\n" +" try=$X11VNC_CREATE_STARTING_DISPLAY_NUMBER\n" +" sry=`expr $try + 99`\n" +" fi\n" " n=\"\"\n" " nsout=\"\"\n" " if [ \"X$have_netstat\" != \"X\" ]; then\n" " nsout=`$have_netstat -an`\n" " fi\n" -" while [ $try -lt 99 ]\n" +" while [ $try -lt $sry ]\n" " do\n" " if [ ! -f \"/tmp/.X${try}-lock\" ]; then\n" " if echo \"$nsout\" | grep \"/tmp/.X11-unix/X${try}[ ]*\\$\" > /dev/null; then\n" @@ -1517,6 +1537,7 @@ char create_display[] = " sess=\"env $sess\"\n" " fi\n" " redir_daemon=`echo \"$redir_daemon\" | sed -e 's/^,*//'`\n" +" echo \"redir_daemon=$redir_daemon\" 1>&2\n" "}\n" "\n" "rchk() {\n" @@ -1730,12 +1751,13 @@ char create_display[] = "# fi\n" "\n" " if [ \"X$redir_daemon\" != \"X\" -a \"X$result\" = \"X1\" ]; then\n" -" redir_daemon=`echo \"$redir_daemon\" | sed -e 's|[^A-z0-9:,/]||g'`\n" +" redir_daemon=`echo \"$redir_daemon\" | sed -e 's/[~!$&*()|;?<>\"]//g' -e \"s/'//g\"`\n" " xprog=$X11VNC_PROG\n" " if [ \"X$xprog\" = \"X\" ]; then\n" " xprog=x11vnc\n" " fi\n" -" $have_nohup sh -c \"$xprog -sleepin 10 -auth $authfile -tsd $redir_daemon\" 2>.tsd.log.$USER 1>&2 &\n" +" echo \"running: $xprog -sleepin 10 -auth $authfile -tsd '$redir_daemon'\" 1>&2\n" +" $have_nohup sh -c \"$xprog -sleepin 10 -auth $authfile -tsd '$redir_daemon' &\" 2>.tsd.log.$USER 1>&2 &\n" " fi\n" "}\n" "\n" |