diff options
author | runge <runge> | 2007-05-01 22:51:56 +0000 |
---|---|---|
committer | runge <runge> | 2007-05-01 22:51:56 +0000 |
commit | 85303147a02cce513cb62fc25ab728238dec69b7 (patch) | |
tree | 90b37234396e6dbb820d813b76ff709f2a569056 /x11vnc/user.c | |
parent | 3fcab6f1ec5238977b28d5d6f5fbae365b1254fa (diff) | |
download | libtdevnc-85303147a02cce513cb62fc25ab728238dec69b7.tar.gz libtdevnc-85303147a02cce513cb62fc25ab728238dec69b7.zip |
ssl: java viewer patches, onetimekey; x11vnc setsid/setpgrp and -cc 4 for -create
Diffstat (limited to 'x11vnc/user.c')
-rw-r--r-- | x11vnc/user.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/x11vnc/user.c b/x11vnc/user.c index 0d78976..6aa3834 100644 --- a/x11vnc/user.c +++ b/x11vnc/user.c @@ -1612,6 +1612,7 @@ if (0) db = 1; } sprintf(geom, "NONE"); xsess[0] = '\0'; + geom[0] = '\0'; #if 0 if (!keep_unixpw_opts) { fprintf(stderr, "no keep_unixpw_opts\n"); @@ -1663,6 +1664,12 @@ if (!keep_unixpw_opts) { } free(t); } + if (geom[0] == '\0' && getenv("FD_GEOM")) { + snprintf(geom, 30, "%s", getenv("FD_GEOM")); + } + if (xsess[0] == '\0' && getenv("FD_SESS")) { + snprintf(xsess, 30, "%s", getenv("FD_SESS")); + } set_env("FD_GEOM", geom); set_env("FD_SESS", xsess); @@ -1690,6 +1697,9 @@ if (!keep_unixpw_opts) { if (db) fprintf(stderr, "create_cmd: %s\n", create_cmd); } + if (getenv("X11VNC_SKIP_DISPLAY")) { + nd = strdup(getenv("X11VNC_SKIP_DISPLAY")); + } if (unixpw && keep_unixpw_opts && keep_unixpw_opts[0] != '\0') { char *q, *t = keep_unixpw_opts; q = strstr(t, "nd="); |