diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-08 16:32:42 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-08 16:32:42 -0500 |
| commit | 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 (patch) | |
| tree | 20e21e8461bc1f17630ce10a2d435b99e627d001 /os | |
| parent | a52c9b2a59f27266557ff9d5d2c08492e04135a6 (diff) | |
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.
Diffstat (limited to 'os')
| -rw-r--r-- | os/utils.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/os/utils.c b/os/utils.c index 322814669..d69936df7 100644 --- a/os/utils.c +++ b/os/utils.c @@ -123,9 +123,6 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifdef XKB #include <xkbsrv.h> #endif -#ifdef XCSECURITY -#include "securitysrv.h" -#endif #ifdef RENDER #include "picture.h" @@ -621,9 +618,6 @@ void UseMsg(void) ErrorF("-render [default|mono|gray|color] set render color alloc policy\n"); #endif ErrorF("-s # screen-saver timeout (minutes)\n"); -#ifdef XCSECURITY - ErrorF("-sp file security policy file\n"); -#endif #ifdef XPRINT PrinterUseMsg(); #endif @@ -1040,12 +1034,6 @@ ProcessCommandLine(int argc, char *argv[]) i = skip - 1; } #endif -#ifdef XCSECURITY - else if ((skip = XSecurityOptions(argc, argv, i)) != i) - { - i = skip - 1; - } -#endif #ifdef AIXV3 else if ( strcmp( argv[i], "-timeout") == 0) { |