summaryrefslogtreecommitdiffstats
path: root/x11vnc/ssltools.h
diff options
context:
space:
mode:
authorrunge <runge>2008-05-08 01:23:45 +0000
committerrunge <runge>2008-05-08 01:23:45 +0000
commitabbdf92a704790374a12d6da5125b4e95595aaac (patch)
tree55fdb539e7b9d2e0447668f1dad77c96df22aeb1 /x11vnc/ssltools.h
parentd8812f8c85fcd83412c6ad275d10ce1c43f22240 (diff)
downloadlibtdevnc-abbdf92a.tar.gz
libtdevnc-abbdf92a.zip
x11vnc: add UltraVNC repeater proxy support. fix to setp gui
mode. -threads is now strongly discouraged. Read PORT= in url. User can set nolisten for Xvfb in -create mode. clean up wait_for_client() to some degree.
Diffstat (limited to 'x11vnc/ssltools.h')
-rw-r--r--x11vnc/ssltools.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h
index 5b46339..c056e97 100644
--- a/x11vnc/ssltools.h
+++ b/x11vnc/ssltools.h
@@ -1400,32 +1400,32 @@ char create_display[] =
" else\n"
" sxcmd=$have_xinit\n"
" fi\n"
-" echo \"$sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS\" 1>&2\n"
+" echo \"$sxcmd $sess -- $* $nolisten -auth $authfile $FD_OPTS\" 1>&2\n"
" if [ \"X$have_root\" != \"X\" ]; then\n"
-" $sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS 1>&2 &\n"
+" $sxcmd $sess -- $* $nolisten -auth $authfile $FD_OPTS 1>&2 &\n"
" else\n"
" if [ \"X$ns\" = \"X0\" ]; then\n"
-" $have_nohup sh -c \"$sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS\" 1>&2 &\n"
+" $have_nohup sh -c \"$sxcmd $sess -- $* $nolisten -auth $authfile $FD_OPTS\" 1>&2 &\n"
" else\n"
" # Why did we ever sleep before starting the server??\n"
-" $have_nohup sh -c \"(sleep $ns; $sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS)\" 1>&2 &\n"
+" $have_nohup sh -c \"(sleep $ns; $sxcmd $sess -- $* $nolisten -auth $authfile $FD_OPTS)\" 1>&2 &\n"
" #result=1\n"
" fi\n"
" fi\n"
" pid=$!\n"
" else\n"
" # need to emulate startx/xinit ourselves...\n"
-" echo \"$* -nolisten tcp -auth $authfile $FD_OPTS\" 1>&2\n"
+" echo \"$* $nolisten -auth $authfile $FD_OPTS\" 1>&2\n"
" if [ \"X$have_root\" != \"X\" ]; then\n"
-" $have_nohup $* -nolisten tcp -auth $authfile $FD_OPTS 1>&2 &\n"
+" $have_nohup $* $nolisten -auth $authfile $FD_OPTS 1>&2 &\n"
" pid=$!\n"
" sleep 3\n"
" $have_nohup $sess 1>&2 &\n"
" else\n"
" if [ \"X$ns\" = \"X0\" ]; then\n"
-" $have_nohup sh -c \"$* -nolisten tcp -auth $authfile $FD_OPTS\" 1>&2 &\n"
+" $have_nohup sh -c \"$* $nolisten -auth $authfile $FD_OPTS\" 1>&2 &\n"
" else\n"
-" $have_nohup sh -c \"(sleep $ns; $* -nolisten tcp -auth $authfile $FD_OPTS)\" 1>&2 &\n"
+" $have_nohup sh -c \"(sleep $ns; $* $nolisten -auth $authfile $FD_OPTS)\" 1>&2 &\n"
" #result=1\n"
" fi\n"
" pid=$!\n"
@@ -1719,6 +1719,8 @@ char create_display[] =
"depth=${depth:-16}\n"
"geom=${geom:-1280x1024}\n"
"\n"
+"nolisten=${FD_NOLISTEN:-\"-nolisten tcp\"}\n"
+"\n"
"if [ \"X$X11VNC_CREATE_GEOM\" != \"X\" -a \"X$FD_GEOM\" = \"X\" ]; then\n"
" FD_GEOM=$X11VNC_CREATE_GEOM\n"
"fi\n"