xserver: Branch 'server-1.2-branch' - 2 commits

[Eamon Walsh]

 Xext/security.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

New commits:
diff-tree 3e39bae79f9dfd278bda1b71b33c665fc9325efc (from dca5274920dd40886832c48946cf7e8189da42a6)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon Nov 6 15:39:06 2006 -0500

    whitespace adjust
    (cherry picked from 75fe0670eb1f71144246f1c20759d5878bbee00 commit)

diff --git a/Xext/security.c b/Xext/security.c
index 2a73b60..c5181ed 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1128,7 +1128,7 @@ CALLBACK(SecurityClientStateCallback)
 	}
 	break;
 
-	case ClientStateRunning:
+    case ClientStateRunning:
 	{ 
 	    XID authId = AuthorizationIDOfClient(client);
 	    SecurityAuthorizationPtr pAuth;
@@ -1148,8 +1148,8 @@ CALLBACK(SecurityClientStateCallback)
 	    }
 	    break;
 	}
-	case ClientStateGone:
-	case ClientStateRetained: /* client disconnected */
+    case ClientStateGone:
+    case ClientStateRetained: /* client disconnected */
 	{
 	    SecurityAuthorizationPtr pAuth;
 
@@ -1169,7 +1169,7 @@ CALLBACK(SecurityClientStateCallback)
 	    }	    
 	    break;
 	}
-	default: break; 
+    default: break; 
     }
 } /* SecurityClientStateCallback */
 
diff-tree dca5274920dd40886832c48946cf7e8189da42a6 (from 19a4be9bf3b38206dbd9313229d9e107d4617e33)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon Nov 6 15:37:50 2006 -0500

    Bug #8875: Security extension causes Xorg to core dump on server reset
    (cherry picked from 0539d9cf2423fc0bed6f5c413beba3080f8abd85 commit)

diff --git a/Xext/security.c b/Xext/security.c
index 54a2b3e..2a73b60 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: