summaryrefslogtreecommitdiffstats
path: root/x11vnc/x11vnc.c
diff options
context:
space:
mode:
authorrunge <runge>2008-06-07 21:12:50 +0000
committerrunge <runge>2008-06-07 21:12:50 +0000
commit975b6902344216c2e4b0e1a38320b822639640dc (patch)
treecb1881214c0c3031f1d0ae9ceb6a6e5a4e12ce37 /x11vnc/x11vnc.c
parenta824cf443df899c8d2178a1bd7581057bd7f60d6 (diff)
downloadlibtdevnc-975b6902344216c2e4b0e1a38320b822639640dc.tar.gz
libtdevnc-975b6902344216c2e4b0e1a38320b822639640dc.zip
x11vnc: -clip xineramaN option, -DIGNORE_GETSPNAM for HP-UX.
Print info on SSH_CONNECTION override.
Diffstat (limited to 'x11vnc/x11vnc.c')
-rw-r--r--x11vnc/x11vnc.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c
index af001ea..9a67d45 100644
--- a/x11vnc/x11vnc.c
+++ b/x11vnc/x11vnc.c
@@ -3857,11 +3857,14 @@ int main(int argc, char* argv[]) {
if (! s) s = "SSH_CONNECTION";
fprintf(stderr, "\n");
rfbLog("Skipping -ssl/-stunnel constraint in"
- " -unixpw\n");
- rfbLog("mode, assuming your SSH encryption"
- " is: %s\n", s);
+ " -unixpw mode,\n");
+ rfbLog("assuming your SSH encryption"
+ " is:\n");
+ rfbLog(" %s\n", s);
rfbLog("Setting -localhost in SSH + -unixpw"
" mode.\n");
+ rfbLog("If you *actually* want SSL, restart"
+ " with -ssl on the cmdline\n");
fprintf(stderr, "\n");
allow_list = strdup("127.0.0.1");
got_localhost = 1;
@@ -4229,6 +4232,9 @@ if (0) fprintf(stderr, "XA: %s\n", getenv("XAUTHORITY"));
if (! quiet) rfbLog("Using default X display.\n");
}
+ if (clip_str != NULL && dpy != NULL) {
+ check_xinerama_clip();
+ }
scr = DefaultScreen(dpy);
rootwin = RootWindow(dpy, scr);