aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-08-11 09:29:17 -0400
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-08-11 09:29:17 -0400
commitcbe2c0e44f412d07024207f374c0f56684adb088 (patch)
tree6bfdeb4cf99ec22f0a6fe60ff7a9e9a792105156 /nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
parent8235925a2c3599a8980ce789e0a79369118727fe (diff)
parent715fcfe6dfc2be12eb6673d2a5e5672af18f9291 (diff)
downloadnx-libs-cbe2c0e44f412d07024207f374c0f56684adb088.tar.gz
nx-libs-cbe2c0e44f412d07024207f374c0f56684adb088.tar.bz2
nx-libs-cbe2c0e44f412d07024207f374c0f56684adb088.zip
Merge branch 'uli42-pr/versionprop' into 3.6.x
Attributes GH PR #501: https://github.com/ArcticaProject/nx-libs/pull/501
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXproperty.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXproperty.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
index ee77eb64e..882dbe61b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
@@ -169,6 +169,15 @@ ProcChangeProperty(ClientPtr client)
}
#endif
+#ifdef NXAGENT_SERVER
+ /* prevent clients from changing the NX_AGENT_VERSION property */
+ {
+ Atom prop = MakeAtom("NX_AGENT_VERSION", strlen("NX_AGENT_VERSION"), True);
+ if (stuff->property == prop)
+ return client->noClientException;
+ }
+#endif
+
err = ChangeWindowProperty(pWin, stuff->property, stuff->type, (int)format,
(int)mode, len, (void *)&stuff[1], TRUE);
if (err != Success)