From 104a3e9e2dbafd31e7b1def3686d052a356fc74a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 15 Feb 2017 09:59:00 +0100 Subject: Naming change: Security*Access -> Dix*Access Backported from X.org: commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1 Author: Eamon Walsh Date: Thu Dec 14 14:45:42 2006 -0500 Naming change: Security*Access -> Dix*Access Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 881d2e2d0..28fdd19f5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -131,7 +131,7 @@ ProcChangeProperty(ClientPtr client) if (pWin == NULL) #endif pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityWriteAccess); + DixWriteAccess); if (!pWin) return(BadWindow); if (!ValidAtom(stuff->property)) @@ -147,7 +147,7 @@ ProcChangeProperty(ClientPtr client) #ifdef XCSECURITY switch (SecurityCheckPropertyAccess(client, pWin, stuff->property, - SecurityWriteAccess)) + DixWriteAccess)) { case SecurityErrorOperation: client->errorValue = stuff->property; @@ -348,7 +348,7 @@ ProcGetProperty(ClientPtr client) if (stuff->delete) UpdateCurrentTime(); pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - SecurityReadAccess); + DixReadAccess); if (!pWin) return BadWindow; @@ -439,10 +439,10 @@ ProcGetProperty(ClientPtr client) #ifdef XCSECURITY { - Mask access_mode = SecurityReadAccess; + Mask access_mode = DixReadAccess; if (stuff->delete) - access_mode |= SecurityDestroyAccess; + access_mode |= DixDestroyAccess; switch(SecurityCheckPropertyAccess(client, pWin, stuff->property, access_mode)) { -- cgit v1.2.3