diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-20 10:33:52 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-20 10:33:52 +0100 |
| commit | 3c322ffbb911b70415c47cb8ba1c3559241819f6 (patch) | |
| tree | e6e1f345f4f8fd25f67b58a1abf80d14381489ce /nx-X11/programs/Xserver/hw/nxagent/Rootless.c | |
| parent | c79f2d289004d419d8bb76cf8bf731980d40da5d (diff) | |
| parent | 104a3e9e2dbafd31e7b1def3686d052a356fc74a (diff) | |
| download | nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.tar.gz nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.tar.bz2 nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.zip | |
Merge branch 'sunweaver-pr/security-acl-naming-change' into 3.6.x
Attributes GH PR #329: https://github.com/ArcticaProject/nx-libs/pull/329
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index bb961e5a8..bb19b3458 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -540,7 +540,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & IconPixmapHint) && (wmHints.icon_pixmap != None)) { PixmapPtr icon = (PixmapPtr)SecurityLookupIDByType(pClient, wmHints.icon_pixmap, - RT_PIXMAP, SecurityDestroyAccess); + RT_PIXMAP, DixDestroyAccess); if (icon) { @@ -567,7 +567,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & IconWindowHint) && (wmHints.icon_window != None)) { WindowPtr icon = (WindowPtr)SecurityLookupWindow(wmHints.icon_window, pClient, - SecurityDestroyAccess); + DixDestroyAccess); if (icon) { @@ -589,7 +589,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & IconMaskHint) && (wmHints.icon_mask != None)) { PixmapPtr icon = (PixmapPtr)SecurityLookupIDByType(pClient, wmHints.icon_mask, - RT_PIXMAP, SecurityDestroyAccess); + RT_PIXMAP, DixDestroyAccess); if (icon) { @@ -611,7 +611,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) if ((wmHints.flags & WindowGroupHint) && (wmHints.window_group != None)) { WindowPtr window = (WindowPtr)SecurityLookupWindow(wmHints.window_group, pClient, - SecurityDestroyAccess); + DixDestroyAccess); if (window) { @@ -695,7 +695,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value) for (i = 0; i < nUnits; i++) { pWindow = (WindowPtr)SecurityLookupWindow(input[i], pClient, - SecurityDestroyAccess); + DixDestroyAccess); if ((input[i] != None) && pWindow) { wind[i] = nxagentWindow(pWindow); |