hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-15 00:13:28 +00:00
Code Issues Projects Releases Wiki Activity

security: drop support for XC-QUERY-SECURITY authorization method.

Browse source
This commit is contained in:
Eamon Walsh 2007-08-03 13:23:34 -04:00 • committed by Eamon Walsh
commit 375864cb74
8 changed files with 3 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Xext/SecurityPolicy
View file

@ -2,13 +2,6 @@ version-1
# $Xorg: SecurityPolicy,v 1.3 2000/08/17 19:47:56 cpqbld Exp $
# The site policy fields are interpreted by the XC-QUERY-SECURITY-1
# authorization protocol. The values are arbitrary and site-specific.
# Refer to the Security Extension Specification for the usage of the policies.
#sitepolicy A
#sitepolicy B
#sitepolicy C
# Property access rules:
# property <property> <window> <permissions>
# <window> ::= any | root | <propertyselector>

64
Xext/security.c
View file

@ -1526,64 +1526,6 @@ SecurityParseExtensionRule(
} /* SecurityParseExtensionRule */
static char **SecurityPolicyStrings = NULL;
static int nSecurityPolicyStrings = 0;
static Bool
SecurityParseSitePolicy(
char *p)
{
char *policyStr = SecurityParseString(&p);
char *copyPolicyStr;
char **newStrings;
if (!policyStr)
return FALSE;
copyPolicyStr = (char *)Xalloc(strlen(policyStr) + 1);
if (!copyPolicyStr)
return TRUE;
strcpy(copyPolicyStr, policyStr);
newStrings = (char **)Xrealloc(SecurityPolicyStrings,
sizeof (char *) * (nSecurityPolicyStrings + 1));
if (!newStrings)
{
Xfree(copyPolicyStr);
return TRUE;
}
SecurityPolicyStrings = newStrings;
SecurityPolicyStrings[nSecurityPolicyStrings++] = copyPolicyStr;
return TRUE;
} /* SecurityParseSitePolicy */
char **
SecurityGetSitePolicyStrings(n)
int *n;
{
*n = nSecurityPolicyStrings;
return SecurityPolicyStrings;
} /* SecurityGetSitePolicyStrings */
static void
SecurityFreeSitePolicyStrings(void)
{
if (SecurityPolicyStrings)
{
assert(nSecurityPolicyStrings);
while (nSecurityPolicyStrings--)
{
Xfree(SecurityPolicyStrings[nSecurityPolicyStrings]);
}
Xfree(SecurityPolicyStrings);
SecurityPolicyStrings = NULL;
nSecurityPolicyStrings = 0;
}
} /* SecurityFreeSitePolicyStrings */
static void
SecurityFreeTrustedExtensionStrings(void)
{
@ -1646,6 +1588,7 @@ SecurityLoadPropertyAccessList(void)
switch (SecurityParseKeyword(&p))
{
case SecurityKeywordComment:
case SecurityKeywordSitePolicy:
validLine = TRUE;
break;
@ -1653,10 +1596,6 @@ SecurityLoadPropertyAccessList(void)
validLine = SecurityParsePropertyAccessRule(p);
break;
case SecurityKeywordSitePolicy:
validLine = SecurityParseSitePolicy(p);
break;
case SecurityKeywordExtension:
validLine = SecurityParseExtensionRule(p);
break;
@ -1837,7 +1776,6 @@ SecurityResetProc(
{
SecurityFreePropertyAccessList();
SecurityFreeTrustedExtensionStrings();
SecurityFreeSitePolicyStrings();
} /* SecurityResetProc */

2
Xext/securitysrv.h
View file

@ -84,6 +84,4 @@ extern int XSecurityOptions(int argc, char **argv, int i);
#define SECURITY_POLICY_FILE_VERSION "version-1"
extern char **SecurityGetSitePolicyStrings(int *n);
#endif /* _SECURITY_SRV_H */