frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework of the XC-SECURITY extension. The gen-auth protocol has not changed, 

but the XC-QUERY-SECURITY-1 authorization method and the SecurityPolicy
configuration file have been removed.  The semantics of the trusted vs.
untrusted split have been changed.  This will be documented in a future
commit.
This commit is contained in:
Eamon Walsh 2007-11-08 16:32:42 -05:00 committed by Eamon Walsh
parent a52c9b2a59
commit 8b5d21cc1d
3 changed files with 312 additions and 1054 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1334
Xext/security.c
View File

File diff suppressed because it is too large Load Diff

4
Xext/securitysrv.h
View File

@ -77,11 +77,7 @@ typedef struct {
Bool valid; /* did anyone recognize it? if so, set to TRUE */ Bool valid; /* did anyone recognize it? if so, set to TRUE */
} SecurityValidateGroupInfoRec; } SecurityValidateGroupInfoRec;
extern int XSecurityOptions(int argc, char **argv, int i);
/* Give this value or higher to the -audit option to get security messages */ /* Give this value or higher to the -audit option to get security messages */
#define SECURITY_AUDIT_LEVEL 4 #define SECURITY_AUDIT_LEVEL 4
#define SECURITY_POLICY_FILE_VERSION "version-1"
#endif /* _SECURITY_SRV_H */ #endif /* _SECURITY_SRV_H */

12
os/utils.c
View File

@ -123,9 +123,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
#ifdef XKB #ifdef XKB
#include <xkbsrv.h> #include <xkbsrv.h>
#endif #endif
#ifdef XCSECURITY
#include "securitysrv.h"
#endif
#ifdef RENDER #ifdef RENDER
#include "picture.h" #include "picture.h"
@ -621,9 +618,6 @@ void UseMsg(void)
ErrorF("-render [default|mono|gray|color] set render color alloc policy\n"); ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
#endif #endif
ErrorF("-s # screen-saver timeout (minutes)\n"); ErrorF("-s # screen-saver timeout (minutes)\n");
#ifdef XCSECURITY
ErrorF("-sp file security policy file\n");
#endif
#ifdef XPRINT #ifdef XPRINT
PrinterUseMsg(); PrinterUseMsg();
#endif #endif
@ -1040,12 +1034,6 @@ ProcessCommandLine(int argc, char *argv[])
i = skip - 1; i = skip - 1;
} }
#endif #endif
#ifdef XCSECURITY
else if ((skip = XSecurityOptions(argc, argv, i)) != i)
{
i = skip - 1;
}
#endif
#ifdef AIXV3 #ifdef AIXV3
else if ( strcmp( argv[i], "-timeout") == 0) else if ( strcmp( argv[i], "-timeout") == 0)
{ {