summaryrefslogtreecommitdiff
path: root/dix/main.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-10-02 15:48:18 -0400
committerAdam Jackson <ajax@redhat.com>2008-10-02 15:48:18 -0400
commit00f01f39454001846869496d9124f62c01e5691a (patch)
tree2fc98a385c223bb7d5a582cb5eaaaef83f27223d /dix/main.c
parenteb8be3e90a9c90a428696026d1e3b2152d7eefb4 (diff)
Don't inherit XAUTHORITY from the environment.
It's not especially obvious, and unpleasantly overloaded for the Xnest case. Typically this gives you a server that looks for its auth data in the authority file you were using for the running X session, which generally doesn't have an entry for the display you just started. All the major dm's, and startx, pass -auth explicitly, so this shouldn't cause too much upheaval.
Diffstat (limited to 'dix/main.c')
-rw-r--r--dix/main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/dix/main.c b/dix/main.c
index 267aba5d1..4e838a9d1 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -253,10 +253,6 @@ int main(int argc, char *argv[], char *envp[])
InitConnectionLimits();
- /* prep X authority file from environment; this can be overriden by a
- * command line option */
- xauthfile = getenv("XAUTHORITY");
- if (xauthfile) InitAuthorization (xauthfile);
ProcessCommandLine(argc, argv);
alwaysCheckForInput[0] = 0;