diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-14 13:35:50 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-14 13:35:50 -0500 |
| commit | 1603130236c55ddabc3854d4ba62d544debcf1f5 (patch) | |
| tree | 02b1cffad943cb69c2b79118b0ab9a758b9e0f1a /dix | |
| parent | f207e69d62bc04c7f254347b03e6d8fa8b569d66 (diff) | |
| parent | f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/xace.c
Xext/xace.h
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 1 | ||||
| -rw-r--r-- | dix/dispatch.c | 4 | ||||
| -rw-r--r-- | dix/getevents.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/dix/devices.c b/dix/devices.c index 5e82759bc..adf2fba45 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -524,6 +524,7 @@ CloseDevice(DeviceIntPtr dev) if (dev->key->xkbInfo) XkbFreeInfo(dev->key->xkbInfo); #endif + dev->key->xkbInfo = NULL; xfree(dev->key->curKeySyms.map); xfree(dev->key->modifierKeyMap); xfree(dev->key); diff --git a/dix/dispatch.c b/dix/dispatch.c index 19d02fd0c..f7196fde7 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -471,9 +471,9 @@ Dispatch(void) if (result > (maxBigRequestSize << 2)) result = BadLength; else { - XaceHook(XACE_AUDIT_BEGIN, client); + XaceHookAuditBegin(client); result = (* client->requestVector[MAJOROP])(client); - XaceHook(XACE_AUDIT_END, client, result); + XaceHookAuditEnd(client, result); } #ifdef XSERVER_DTRACE XSERVER_REQUEST_DONE(GetRequestName(MAJOROP), MAJOROP, diff --git a/dix/getevents.c b/dix/getevents.c index d3adecea8..08744ae03 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -207,11 +207,13 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator, * * Should be used in DIX as: * xEvent *events = xcalloc(sizeof(xEvent), GetMaximumEventsNum()); + * + * This MUST be absolutely constant, from init until exit. */ _X_EXPORT int GetMaximumEventsNum(void) { /* Two base events -- core and device, plus valuator events. Multiply - * by two if we're doing key repeats. */ + * by two if we're doing non-XKB key repeats. */ int ret = 2 + MAX_VALUATOR_EVENTS; #ifdef XKB |