summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 02:02:46 +0100
committerKeith Packard <keithp@keithp.com>2012-07-09 22:57:53 -0700
commit656af2c7e73d948338683675e14cd827b46a97c4 (patch)
tree117bdda2070819454ec6050173b01f192c654584
parentdc0c2dd92d5eb314582ea10830678753824375d9 (diff)
Don't make failure to -nolisten fatal
If failing to disable a protocol specified by -nolisten failed, we'd throw a FatalError and bomb startup entirely. From poking at xtrans, it looks like the only way we can get a failure here is because we've specified a protocol name which doesn't exist, which probably doesn't constitute a security risk. And it makes it possible to start gdm even though you've built with --disable-tcp-transport. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--os/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/os/utils.c b/os/utils.c
index 253793467..b00d38b70 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -757,8 +757,8 @@ ProcessCommandLine(int argc, char *argv[])
else if (strcmp(argv[i], "-nolisten") == 0) {
if (++i < argc) {
if (_XSERVTransNoListen(argv[i]))
- FatalError("Failed to disable listen for %s transport",
- argv[i]);
+ ErrorF("Failed to disable listen for %s transport",
+ argv[i]);
}
else
UseMsg();