aboutsummaryrefslogtreecommitdiffstats
path: root/unix/xserver/hw
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2025-04-08 14:41:04 +0200
committerPierre Ossman <ossman@cendio.se>2025-04-08 14:41:04 +0200
commit1f1aaca09a1f9919f5169caea9c396b14c2af765 (patch)
tree1a8d7dbaf3b9d1b3045e938d87facc1618a0357b /unix/xserver/hw
parentf6ae8c1f6e6e71196f6b6bd2783dbb3d0d45c2f0 (diff)
downloadtigervnc-master.tar.gz
tigervnc-master.zip
Don't print Xvnc banner before parsing argsHEADmaster
If we'll be running in inetd mode, then stdout and stderr will be a client socket and not an appropriate place for logging. Mimic what Xorg does instead.
Diffstat (limited to 'unix/xserver/hw')
-rw-r--r--unix/xserver/hw/vnc/xvnc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index ddb24993..a13168c4 100644
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -446,7 +446,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
}
if (!strcmp(argv[i], "-showconfig") || !strcmp(argv[i], "-version")) {
- /* Already shown at start */
+ vncPrintBanner();
exit(0);
}
@@ -1171,8 +1171,11 @@ InitOutput(ScreenInfo * scrInfo, int argc, char **argv)
int i;
int NumFormats = 0;
- if (serverGeneration == 1)
+ if (serverGeneration == 1) {
+ vncPrintBanner();
+
LoadExtensionList(vncExtensions, ARRAY_SIZE(vncExtensions), TRUE);
+ }
#if XORG_AT_LEAST(1, 20, 0)
xorgGlxCreateVendor();
@@ -1266,7 +1269,5 @@ vncClientGone(int fd)
int
main(int argc, char *argv[], char *envp[])
{
- vncPrintBanner();
-
return dix_main(argc, argv, envp);
}