diff options
| author | runge <runge@karlrunge.com> | 2010-04-09 20:09:15 -0400 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2010-04-09 20:09:15 -0400 |
| commit | 2a8ba97ec5b0f7fbfcfc8adab6732a95e95c7204 (patch) | |
| tree | 7da693c36f06f4e16e8bc2b030c54b67f01d8671 /x11vnc/ssltools.h | |
| parent | 5c53ccbbe99dbf098dbb396a65b487f08315d825 (diff) | |
| download | libvncserver-2a8ba97ec5b0f7fbfcfc8adab6732a95e95c7204.zip libvncserver-2a8ba97ec5b0f7fbfcfc8adab6732a95e95c7204.tar.gz | |
x11vnc: exit(1) for -connect_or_exit failure, quiet query mode for grab_state, pointer_pos, etc. ipv6 support. STUNNEL_LISTEN for particular interface. -input_eagerly in addition to -allinput. quiet Xinerama message.
Diffstat (limited to 'x11vnc/ssltools.h')
| -rw-r--r-- | x11vnc/ssltools.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index 534dbdd..c402ded 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -789,6 +789,7 @@ char find_display[] = " exit 1\n" "fi\n" "\n" +"# Set PATH to pick up utilities we use below.\n" "PATH=$PATH:/bin:/usr/bin:/usr/X11R6/bin:/usr/bin/X11:/usr/openwin/bin:/usr/ucb\n" "export PATH\n" "\n" @@ -1823,6 +1824,10 @@ char create_display[] = " chmod 755 $stmp || exit 1\n" " echo \"#!/bin/sh\" > $stmp\n" " #echo \"(id; env; env | grep XAUTHORITY | sed -e 's/XAUTHORITY=//' | xargs ls -l) > /tmp/ENV.OUT.$$\" >> $stmp\n" +" if [ \"X$SAVE_PATH\" != \"X\" ]; then\n" +" echo \"PATH=\\\"$SAVE_PATH\\\"\" >> $stmp\n" +" echo \"export PATH\" >> $stmp\n" +" fi\n" " if [ \"X$noxauth\" = \"X1\" ]; then\n" " echo \"unset XAUTHORITY\" >> $stmp\n" " fi\n" @@ -1971,25 +1976,6 @@ char create_display[] = " fi\n" " done\n" "\n" -"# if [ \"X$result\" = \"X1\" ]; then\n" -"# if [ \"X$use_xdmcp_query\" = \"X0\" -a \"X$have_xdpyinfo\" != \"X\" ]; then\n" -"# ok=0\n" -"# for t in 1 2 3 4\n" -"# do\n" -"# $have_xdpyinfo >/dev/null 2>&1\n" -"# if [ $? != 0 ]; then\n" -"# sleep 1\n" -"# else\n" -"# ok=1\n" -"# break;\n" -"# fi\n" -"# done\n" -"# if [ \"X$ok\" = \"X0\" ]; then\n" -"# result=0\n" -"# fi\n" -"# fi\n" -"# fi\n" -"\n" " if [ \"X$redir_daemon\" != \"X\" -a \"X$result\" = \"X1\" ]; then\n" " redir_daemon=`echo \"$redir_daemon\" | sed -e 's/[~!$&*()|;?<>\"]//g' -e \"s/'//g\"`\n" " xprog=$X11VNC_PROG\n" @@ -2276,6 +2262,8 @@ char create_display[] = " USER=`whoami`\n" "fi\n" "\n" +"# Set PATH to have a better chance of finding things:\n" +"SAVE_PATH=$PATH\n" "PATH=$PATH:/usr/X11R6/bin:/usr/bin/X11:/usr/openwin/bin:/usr/dt/bin:/opt/kde4/bin:/opt/kde3/bin:/opt/gnome/bin:/usr/bin:/bin:/usr/sfw/bin:/usr/local/bin\n" "\n" "have_root=\"\"\n" |
