diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:02:46 +0100 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2012-08-01 18:02:06 -0700 |
| commit | 7b7db8ced263093bdcc1e57dfe7574e07cd5b63a (patch) | |
| tree | d0fb90c201b983b0b9cf20d4fecda34c558cb7f2 | |
| parent | af7ff8f1ccec722bc8690c6f512a986b0f3c7a9c (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>
(cherry picked from commit 656af2c7e73d948338683675e14cd827b46a97c4)
| -rw-r--r-- | os/utils.c | 4 |
1 files 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(); |