aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions/security.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-27 08:08:37 +0000
committermarha <marha@users.sourceforge.net>2010-05-27 08:08:37 +0000
commit958dcdff6d845fcff20a414bd28be8ee2ced8c6c (patch)
tree3bc998a5af389cd1357dd672d96828573025cd0a /X11/extensions/security.h
parent9b02c06e9c08d3d537d0a6fed3304b2146d49511 (diff)
parentbc4f49f9a9eccb73bc2c5610295febaf4b14559e (diff)
downloadvcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.gz
vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.bz2
vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.zip
svn merge ^/branches/released .
Diffstat (limited to 'X11/extensions/security.h')
-rw-r--r--X11/extensions/security.h34
1 files changed, 1 insertions, 33 deletions
diff --git a/X11/extensions/security.h b/X11/extensions/security.h
index fc7ade236..be7a86203 100644
--- a/X11/extensions/security.h
+++ b/X11/extensions/security.h
@@ -32,37 +32,7 @@ from The Open Group.
#define _XAUTH_STRUCT_ONLY
#include <X11/Xauth.h>
-/* constants that server, library, and application all need */
-
-#define XSecurityNumberEvents 1
-#define XSecurityNumberErrors 2
-#define XSecurityBadAuthorization 0
-#define XSecurityBadAuthorizationProtocol 1
-
-/* trust levels */
-#define XSecurityClientTrusted 0
-#define XSecurityClientUntrusted 1
-
-/* authorization attribute masks */
-#define XSecurityTimeout (1<<0)
-#define XSecurityTrustLevel (1<<1)
-#define XSecurityGroup (1<<2)
-#define XSecurityEventMask (1<<3)
-#define XSecurityAllAuthorizationAttributes \
- (XSecurityTimeout | XSecurityTrustLevel | XSecurityGroup | XSecurityEventMask)
-
-/* event masks */
-#define XSecurityAuthorizationRevokedMask (1<<0)
-#define XSecurityAllEventMasks XSecurityAuthorizationRevokedMask
-
-/* event offsets */
-#define XSecurityAuthorizationRevoked 0
-
-#define XSecurityAuthorizationName "XC-QUERY-SECURITY-1"
-#define XSecurityAuthorizationNameLen 19
-
-
-#ifndef _SECURITY_SERVER
+#include <X11/extensions/secur.h>
_XFUNCPROTOBEGIN
@@ -106,6 +76,4 @@ typedef struct {
XSecurityAuthorization auth_id; /* revoked authorization id */
} XSecurityAuthorizationRevokedEvent;
-#endif /* _SECURITY_SERVER */
-
#endif /* _SECURITY_H */