From 7b7db8ced263093bdcc1e57dfe7574e07cd5b63a Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 10 Jul 2012 02:02:46 +0100 Subject: [PATCH] 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 Reviewed-by: Alan Coopersmith Signed-off-by: Keith Packard (cherry picked from commit 656af2c7e73d948338683675e14cd827b46a97c4) --- os/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os/utils.c b/os/utils.c index 30592d2cc..e33e4d22e 100644 --- a/os/utils.c +++ b/os/utils.c @@ -746,8 +746,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();