Commit 23f6dc3d authored by runge's avatar runge

x11vnc: fix -users bob= in -inetd mode.

parent 23178cd1
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.TH X11VNC "1" "February 2007" "x11vnc " "User Commands" .TH X11VNC "1" "February 2007" "x11vnc " "User Commands"
.SH NAME .SH NAME
x11vnc - allow VNC connections to real X11 displays x11vnc - allow VNC connections to real X11 displays
version: 0.8.5, lastmod: 2007-02-18 version: 0.8.5, lastmod: 2007-02-19
.SH SYNOPSIS .SH SYNOPSIS
.B x11vnc .B x11vnc
[OPTION]... [OPTION]...
......
...@@ -950,7 +950,18 @@ static void check_rcfile(int argc, char **argv) { ...@@ -950,7 +950,18 @@ static void check_rcfile(int argc, char **argv) {
} }
static void immediate_switch_user(int argc, char* argv[]) { static void immediate_switch_user(int argc, char* argv[]) {
int i; int i, bequiet = 0;
for (i=1; i < argc; i++) {
if (strcmp(argv[i], "-inetd")) {
bequiet = 1;
}
if (strcmp(argv[i], "-quiet")) {
bequiet = 1;
}
if (strcmp(argv[i], "-q")) {
bequiet = 1;
}
}
for (i=1; i < argc; i++) { for (i=1; i < argc; i++) {
char *u; char *u;
...@@ -976,7 +987,9 @@ static void immediate_switch_user(int argc, char* argv[]) { ...@@ -976,7 +987,9 @@ static void immediate_switch_user(int argc, char* argv[]) {
fprintf(stderr, "Could not switch to user: %s\n", u+1); fprintf(stderr, "Could not switch to user: %s\n", u+1);
exit(1); exit(1);
} else { } else {
if (!bequiet) {
fprintf(stderr, "Switched to user: %s\n", u+1); fprintf(stderr, "Switched to user: %s\n", u+1);
}
started_as_root = 2; started_as_root = 2;
} }
free(u); free(u);
......
...@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0; ...@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0;
int xdamage_base_event_type = 0; int xdamage_base_event_type = 0;
/* date +'lastmod: %Y-%m-%d' */ /* date +'lastmod: %Y-%m-%d' */
char lastmod[] = "0.8.5 lastmod: 2007-02-18"; char lastmod[] = "0.8.5 lastmod: 2007-02-19";
/* X display info */ /* X display info */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment