summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2006-11-06 15:37:50 -0500
committerEamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>2006-11-06 15:37:50 -0500
commitdca5274920dd40886832c48946cf7e8189da42a6 (patch)
treebee01f12ec015931a54c9b44570fe22fc97f9168 /Xext
parent19a4be9bf3b38206dbd9313229d9e107d4617e33 (diff)
Bug #8875: Security extension causes Xorg to core dump on server reset
(cherry picked from 0539d9cf2423fc0bed6f5c413beba3080f8abd85 commit)
Diffstat (limited to 'Xext')
-rw-r--r--Xext/security.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Xext/security.c b/Xext/security.c
index 54a2b3e3f..2a73b6066 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1122,8 +1122,10 @@ CALLBACK(SecurityClientStateCallback)
switch (client->clientState)
{
case ClientStateInitial:
- TRUSTLEVEL(serverClient) = XSecurityClientTrusted;
- AUTHID(serverClient) = None;
+ if (client == serverClient) {
+ TRUSTLEVEL(serverClient) = XSecurityClientTrusted;
+ AUTHID(serverClient) = None;
+ }
break;
case ClientStateRunning: