diff options
| -rw-r--r-- | Xext/xace.c | 20 | ||||
| -rw-r--r-- | Xext/xace.h | 4 | ||||
| -rw-r--r-- | Xext/xacestr.h | 14 |
3 files changed, 13 insertions, 25 deletions
diff --git a/Xext/xace.c b/Xext/xace.c index 46fe7bc66..50361d06b 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -156,24 +156,18 @@ int XaceHook(int hook, ...) prv = &rec.status; break; } - case XACE_SITE_POLICY: { - XaceSitePolicyRec rec = { - va_arg(ap, char*), - va_arg(ap, int), - BadValue /* default unrecognized */ + case XACE_SCREEN_ACCESS: + case XACE_SCREENSAVER_ACCESS: { + XaceScreenAccessRec rec = { + va_arg(ap, ClientPtr), + va_arg(ap, ScreenPtr), + va_arg(ap, Mask), + Success /* default allow */ }; calldata = &rec; prv = &rec.status; break; } - case XACE_DECLARE_EXT_SECURE: { - XaceDeclareExtSecureRec rec = { - va_arg(ap, ExtensionEntry*), - va_arg(ap, Bool) - }; - calldata = &rec; - break; - } case XACE_AUTH_AVAIL: { XaceAuthAvailRec rec = { va_arg(ap, ClientPtr), diff --git a/Xext/xace.h b/Xext/xace.h index 083261273..e2982cfe2 100644 --- a/Xext/xace.h +++ b/Xext/xace.h @@ -51,8 +51,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define XACE_EXT_ACCESS 8 #define XACE_HOSTLIST_ACCESS 9 #define XACE_SELECTION_ACCESS 10 -#define XACE_SITE_POLICY 11 -#define XACE_DECLARE_EXT_SECURE 12 +#define XACE_SCREEN_ACCESS 11 +#define XACE_SCREENSAVER_ACCESS 12 #define XACE_AUTH_AVAIL 13 #define XACE_KEY_AVAIL 14 #define XACE_AUDIT_BEGIN 15 diff --git a/Xext/xacestr.h b/Xext/xacestr.h index 8eb74d50f..8d092514d 100644 --- a/Xext/xacestr.h +++ b/Xext/xacestr.h @@ -101,18 +101,12 @@ typedef struct { int status; } XaceSelectionAccessRec; -/* XACE_SITE_POLICY */ typedef struct { - char *policyString; - int len; + ClientPtr client; + ScreenPtr screen; + Mask access_mode; int status; -} XaceSitePolicyRec; - -/* XACE_DECLARE_EXT_SECURE */ -typedef struct { - ExtensionEntry *ext; - Bool secure; -} XaceDeclareExtSecureRec; +} XaceScreenAccessRec; /* XACE_AUTH_AVAIL */ typedef struct { |