diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-03-22 13:06:50 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-03-22 14:07:01 -0400 |
| commit | 1b58304ac837735920747ed0f0d10ba331bdaeb7 (patch) | |
| tree | 8627267aaf8acc315520292f4fdf88a2eb6ab700 /Xext | |
| parent | 5486be4898766205149fadce71529724eb78fbf3 (diff) | |
xace: add new argument to property hook for property structure itself.
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/security.c | 6 | ||||
| -rw-r--r-- | Xext/xace.c | 3 | ||||
| -rw-r--r-- | Xext/xacestr.h | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Xext/security.c b/Xext/security.c index 98e91ad48..b7a0925c7 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -28,14 +28,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif -#include "dixstruct.h" -#include "extnsionst.h" -#include "windowstr.h" -#include "inputstr.h" #include "scrnintstr.h" -#include "gcstruct.h" #include "colormapst.h" -#include "propertyst.h" #include "xacestr.h" #include "securitysrv.h" #include <X11/extensions/securstr.h> diff --git a/Xext/xace.c b/Xext/xace.c index 9502b5da9..8e277ac81 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -22,9 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #include <stdarg.h> -#include "windowstr.h" #include "scrnintstr.h" -#include "gcstruct.h" #include "xacestr.h" #include "modinit.h" @@ -97,6 +95,7 @@ int XaceHook(int hook, ...) XacePropertyAccessRec rec = { va_arg(ap, ClientPtr), va_arg(ap, WindowPtr), + va_arg(ap, PropertyPtr), va_arg(ap, Atom), va_arg(ap, Mask), XaceAllowOperation /* default allow */ diff --git a/Xext/xacestr.h b/Xext/xacestr.h index edf7b66fb..19d154021 100644 --- a/Xext/xacestr.h +++ b/Xext/xacestr.h @@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "gcstruct.h" #include "windowstr.h" #include "inputstr.h" +#include "propertyst.h" #include "selection.h" #include "xace.h" @@ -59,6 +60,7 @@ typedef struct { typedef struct { ClientPtr client; WindowPtr pWin; + PropertyPtr pProp; Atom propertyName; Mask access_mode; int rval; |