aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/randr
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/randr')
-rw-r--r--nx-X11/programs/Xserver/randr/randrstr.h8
-rw-r--r--nx-X11/programs/Xserver/randr/rrdispatch.c2
-rw-r--r--nx-X11/programs/Xserver/randr/rrmode.c2
-rw-r--r--nx-X11/programs/Xserver/randr/rrmonitor.c6
-rw-r--r--nx-X11/programs/Xserver/randr/rroutput.c4
-rw-r--r--nx-X11/programs/Xserver/randr/rrprovider.c2
-rw-r--r--nx-X11/programs/Xserver/randr/rrscreen.c10
-rw-r--r--nx-X11/programs/Xserver/randr/rrxinerama.c6
8 files changed, 18 insertions, 22 deletions
diff --git a/nx-X11/programs/Xserver/randr/randrstr.h b/nx-X11/programs/Xserver/randr/randrstr.h
index 459a47383..4b497f82d 100644
--- a/nx-X11/programs/Xserver/randr/randrstr.h
+++ b/nx-X11/programs/Xserver/randr/randrstr.h
@@ -443,12 +443,8 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType;
(SecurityLookupIDByType (client, id, \
RRProviderType, a)))
-#define DixUnknownAccess SecurityUnknownAccess
-#define DixReadAccess SecurityReadAccess
-#define DixWriteAccess SecurityWriteAccess
-#define DixSetAttrAccess SecurityWriteAccess
-#define DixUseAccess SecurityWriteAccess
-#define DixDestroyAccess SecurityDestroyAccess
+#define DixSetAttrAccess DixWriteAccess
+#define DixUseAccess DixWriteAccess
#endif
diff --git a/nx-X11/programs/Xserver/randr/rrdispatch.c b/nx-X11/programs/Xserver/randr/rrdispatch.c
index 14f74d771..68d3b97e6 100644
--- a/nx-X11/programs/Xserver/randr/rrdispatch.c
+++ b/nx-X11/programs/Xserver/randr/rrdispatch.c
@@ -87,7 +87,7 @@ ProcRRSelectInput(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityWriteAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixWriteAccess);
rc = pWin ? Success : BadWindow;
#endif
if (rc != Success)
diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
index 8f8d2d0aa..876ebea42 100644
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -360,7 +360,7 @@ ProcRRCreateMode(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
if (rc != Success)
diff --git a/nx-X11/programs/Xserver/randr/rrmonitor.c b/nx-X11/programs/Xserver/randr/rrmonitor.c
index 8829caf2f..13b061c35 100644
--- a/nx-X11/programs/Xserver/randr/rrmonitor.c
+++ b/nx-X11/programs/Xserver/randr/rrmonitor.c
@@ -636,7 +636,7 @@ ProcRRGetMonitors(ClientPtr client)
#ifndef NXAGENT_SERVER
r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess);
#else
- window = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ window = SecurityLookupWindow(stuff->window, client, DixReadAccess);
r = window ? Success : BadWindow;
#endif
@@ -723,7 +723,7 @@ ProcRRSetMonitor(ClientPtr client)
#ifndef NXAGENT_SERVER
r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess);
#else
- window = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ window = SecurityLookupWindow(stuff->window, client, DixReadAccess);
r = window ? Success : BadWindow;
#endif
@@ -772,7 +772,7 @@ ProcRRDeleteMonitor(ClientPtr client)
#ifndef NXAGENT_SERVER
r = dixLookupWindow(&window, stuff->window, client, DixGetAttrAccess);
#else
- window = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ window = SecurityLookupWindow(stuff->window, client, DixReadAccess);
r = window ? Success : BadWindow;
#endif
diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c
index e5f69e010..c4da7d534 100644
--- a/nx-X11/programs/Xserver/randr/rroutput.c
+++ b/nx-X11/programs/Xserver/randr/rroutput.c
@@ -587,7 +587,7 @@ ProcRRSetOutputPrimary(ClientPtr client)
#ifndef NXAGENT_SERVER
ret = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
ret = pWin ? Success : BadWindow;
#endif
@@ -645,7 +645,7 @@ ProcRRGetOutputPrimary(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
diff --git a/nx-X11/programs/Xserver/randr/rrprovider.c b/nx-X11/programs/Xserver/randr/rrprovider.c
index ed2b1baca..0ac9474c6 100644
--- a/nx-X11/programs/Xserver/randr/rrprovider.c
+++ b/nx-X11/programs/Xserver/randr/rrprovider.c
@@ -69,7 +69,7 @@ ProcRRGetProviders(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c
index bdb8b6dd3..1a30b29d4 100644
--- a/nx-X11/programs/Xserver/randr/rrscreen.c
+++ b/nx-X11/programs/Xserver/randr/rrscreen.c
@@ -222,7 +222,7 @@ ProcRRGetScreenSizeRange(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
@@ -276,7 +276,7 @@ ProcRRSetScreenSize(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
if (rc != Success)
@@ -532,7 +532,7 @@ rrGetScreenResources(ClientPtr client, Bool query)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
if (rc != Success)
@@ -806,7 +806,7 @@ ProcRRGetScreenInfo(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
@@ -980,7 +980,7 @@ ProcRRSetScreenConfig(ClientPtr client)
rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixWriteAccess);
#else /* !defined(NXAGENT_SERVER) */
pDraw =
- SecurityLookupDrawable(stuff->drawable, client, SecurityWriteAccess);
+ SecurityLookupDrawable(stuff->drawable, client, DixWriteAccess);
rc = pDraw ? Success : BadDrawable;
#endif /* !defined(NXAGENT_SERVER) */
diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c
index 5c80e52db..d863897a7 100644
--- a/nx-X11/programs/Xserver/randr/rrxinerama.c
+++ b/nx-X11/programs/Xserver/randr/rrxinerama.c
@@ -150,7 +150,7 @@ ProcRRXineramaGetState(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
@@ -205,7 +205,7 @@ ProcRRXineramaGetScreenCount(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
if (rc != Success)
@@ -240,7 +240,7 @@ ProcRRXineramaGetScreenSize(ClientPtr client)
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
#else
- pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
+ pWin = SecurityLookupWindow(stuff->window, client, DixReadAccess);
rc = pWin ? Success : BadWindow;
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 05:08:29 +0000