diff options
| author | runge <runge> | 2006-05-07 00:50:13 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-05-07 00:50:13 +0000 |
| commit | 279f35495a122c9892198545f83e03c6fc50fa08 (patch) | |
| tree | 7ce00691a9f77432cead7a5f4ae702fc62878019 /x11vnc/user.c | |
| parent | 0d734ad8967eafab1fb058280a0db04e7470e569 (diff) | |
| download | libtdevnc-279f35495a122c9892198545f83e03c6fc50fa08.tar.gz libtdevnc-279f35495a122c9892198545f83e03c6fc50fa08.zip | |
x11vnc: support for video4linux webcams & tv-tuners, -24to32 bpp option, -rawfb console.
Diffstat (limited to 'x11vnc/user.c')
| -rw-r--r-- | x11vnc/user.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/x11vnc/user.c b/x11vnc/user.c index eafbb2f..78eb6dd 100644 --- a/x11vnc/user.c +++ b/x11vnc/user.c @@ -445,10 +445,13 @@ void lurk_loop(char *str) { } static int guess_user_and_switch(char *str, int fb_mode) { - char *dstr, *d = DisplayString(dpy); + char *dstr, *d; char *p, *tstr = NULL, *allowed = NULL, *logins, **users = NULL; int dpy1, ret = 0; + RAWFB_RET(0) + + d = DisplayString(dpy); /* pick out ":N" */ dstr = strchr(d, ':'); if (! dstr) { @@ -639,7 +642,7 @@ static int switch_user_env(uid_t uid, char *name, char *home, int fb_mode) { * OK tricky here, we need to free the shm... otherwise * we won't be able to delete it as the other user... */ - if (fb_mode == 1 && using_shm) { + if (fb_mode == 1 && (using_shm && ! xform24to32)) { reset_fb = 1; clean_shm(0); free_tiles(); |