diff options
Diffstat (limited to 'x11vnc/ssltools.h')
| -rw-r--r-- | x11vnc/ssltools.h | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index a08ebb8..534dbdd 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -1603,7 +1603,7 @@ char create_display[] = " fi\n" " if [ -f \"$home/.dmrc\" ]; then\n" " if [ \"X$have_startkde\" != \"X\" ]; then\n" -" if egrep -i 'Session=(default|kde)' \"$home/.dmrc\" > /dev/null; then\n" +" if egrep -i 'Session=kde' \"$home/.dmrc\" > /dev/null; then\n" " echo \"$have_startkde\"\n" " return\n" " fi\n" @@ -1632,6 +1632,18 @@ char create_display[] = " fi\n" " \n" " done\n" +" if egrep -i 'Session=default' \"$home/.dmrc\" > /dev/null; then\n" +" if [ \"X$have_gnome_session\" != \"X\" ]; then\n" +" echo \"$have_gnome_session\"\n" +" return\n" +" elif [ \"X$have_startkde\" != \"X\" ]; then\n" +" echo \"$have_startkde\"\n" +" return\n" +" elif [ \"X$have_startxfce\" != \"X\" ]; then\n" +" echo \"$have_startxfce\"\n" +" return\n" +" fi\n" +" fi\n" " fi\n" " if [ -f \"$home/.xsession\" ]; then\n" " echo \"$home/.xsession\"\n" @@ -1851,19 +1863,30 @@ char create_display[] = "\n" " if [ \"X$use_xdmcp_query\" = \"X1\" ]; then\n" " # we cannot use -nolisten tcp\n" -" echo \"$* -once -query localhost $FD_OPTS\" 1>&2\n" +" if [ \"X$FD_XDMCP_IF\" != \"X\" ]; then\n" +" lhost=$FD_XDMCP_IF\n" +" elif [ \"X$have_netstat\" = \"X\" ]; then\n" +" lhost=localhost\n" +" elif $have_netstat -an | grep -w 177 | grep -w udp > /dev/null; then\n" +" lhost=localhost\n" +" elif $have_netstat -an | grep -w 177 | grep -w udp6 > /dev/null; then\n" +" lhost=::1\n" +" else\n" +" lhost=localhost\n" +" fi\n" +" echo \"$* -once -query $lhost $FD_OPTS\" 1>&2\n" " if [ \"X$have_root\" != \"X\" ]; then\n" " if [ -r $authfile ]; then\n" -" $have_nohup $* -once -query localhost -auth $authfile $FD_OPTS 1>&2 &\n" +" $have_nohup $* -once -query $lhost -auth $authfile $FD_OPTS 1>&2 &\n" " else\n" " # why did we have this?\n" -" $have_nohup $* -once -query localhost $FD_OPTS 1>&2 &\n" +" $have_nohup $* -once -query $lhost $FD_OPTS 1>&2 &\n" " fi\n" " else\n" " if [ \"X$ns\" = \"X0\" ]; then\n" -" $have_nohup sh -c \"$* -once -query localhost -auth $authfile $FD_OPTS\" 1>&2 &\n" +" $have_nohup sh -c \"$* -once -query $lhost -auth $authfile $FD_OPTS\" 1>&2 &\n" " else\n" -" $have_nohup sh -c \"(sleep $ns; $* -once -query localhost -auth $authfile $FD_OPTS)\" 1>&2 &\n" +" $have_nohup sh -c \"(sleep $ns; $* -once -query $lhost -auth $authfile $FD_OPTS)\" 1>&2 &\n" " #result=1\n" " fi\n" " fi\n" |