From de16a8c53046764dbdf26a87acc5c984ef00d818 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 7 Feb 2008 20:14:16 -0500
Subject: XACE: Correct some protocol error values in the colormap routines.

---
 dix/dispatch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dix')

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 663bf7dd5..0bca4417e 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2537,7 +2537,7 @@ ProcFreeColormap(ClientPtr client)
     else 
     {
 	client->errorValue = stuff->id;
-	return rc;
+	return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2566,7 +2566,7 @@ ProcCopyColormapAndFree(ClientPtr client)
     else
     {
 	client->errorValue = stuff->srcCmap;
-	return rc;
+	return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2658,7 +2658,7 @@ ProcListInstalledColormaps(ClientPtr client)
     xfree(preply);
     rc = client->noClientException;
 out:
-    return (rc == BadValue) ? BadColor : rc;
+    return rc;
 }
 
 int
-- 
cgit v1.2.3