diff options
Diffstat (limited to 'x11vnc/ssltools.h')
| -rw-r--r-- | x11vnc/ssltools.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index 6557a9b..b4ad7d0 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -1010,12 +1010,20 @@ char find_display[] = " else\n" " skip=\":$skip\"\n" " fi\n" +" skip2=`echo \"$skip\" | sed -e 's/\\.[0-9][0-9]*$//'`\n" +"\n" " if echo \"$skip\" | grep \":$dtry1\\>\" > /dev/null; then\n" " mat=1\n" " break\n" " elif echo \"$skip\" | grep \":$dtry2\\>\" > /dev/null; then\n" " mat=1\n" " break\n" +" elif [ \"X$skip2\" = \"X:$dtry1\" ]; then\n" +" mat=1\n" +" break\n" +" elif [ \"X$skip2\" = \"X:$dtry2\" ]; then\n" +" mat=1\n" +" break\n" " fi\n" " done\n" " if [ \"X$X11VNC_SKIP_DISPLAY_NEGATE\" = \"X\" ]; then\n" @@ -2402,14 +2410,24 @@ char create_display[] = "\n" " if echo \"$curr_try\" | grep -i '^Xdummy\\>' > /dev/null; then\n" " try_Xdummy\n" +" elif echo \"$curr_try\" | grep -i '^Xdummy$' > /dev/null; then\n" +" try_Xdummy\n" " elif echo \"$curr_try\" | grep -i '^Xvfb\\>' > /dev/null; then\n" " try_Xvfb\n" +" elif echo \"$curr_try\" | grep -i '^Xvfb$' > /dev/null; then\n" +" try_Xvfb\n" " elif echo \"$curr_try\" | grep -i '^Xvnc\\>' > /dev/null; then\n" " try_Xvnc\n" +" elif echo \"$curr_try\" | grep -i '^Xvnc$' > /dev/null; then\n" +" try_Xvnc\n" " elif echo \"$curr_try\" | grep -i '^Xsrv\\>' > /dev/null; then\n" " try_Xsrv\n" +" elif echo \"$curr_try\" | grep -i '^Xsrv$' > /dev/null; then\n" +" try_Xsrv\n" " elif echo \"$curr_try\" | grep -i '^X\\>' > /dev/null; then\n" " try_X\n" +" elif echo \"$curr_try\" | grep -i '^X$' > /dev/null; then\n" +" try_X\n" " fi\n" " if [ \"X$result\" = \"X1\" ]; then\n" " echo \"DISPLAY=:$N\"\n" |