diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-06-18 21:02:28 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-06-23 20:50:29 -0400 |
| commit | 119b96667778391436998c76a68bf64e746c9e08 (patch) | |
| tree | 867e894a7e37cc232ce356c60f17a1beba78f891 /Xi/xichangehierarchy.c | |
| parent | 07c36e4fdcd93df3d33bdab6cca4780ebc9c1f54 (diff) | |
Xi: fix up access modes for calls to dixLookupDevice().
New access modes are being passed to the device access hook for XI2:
DixCreateAccess for creating a new master device;
DixAdd/RemoveAccess for attaching/removing slave devices to a master; and
DixListProp/GetProp/SetPropAccess for device properties.
Refer to the XACE-Spec document in xorg-docs, section "Device Access."
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Diffstat (limited to 'Xi/xichangehierarchy.c')
| -rw-r--r-- | Xi/xichangehierarchy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 5401554ac..917a0d7d9 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -340,7 +340,7 @@ ProcXIChangeHierarchy(ClientPtr client) newkeybd; rc = dixLookupDevice(&newptr, r->return_pointer, - client, DixWriteAccess); + client, DixAddAccess); if (rc != Success) goto unwind; @@ -352,7 +352,7 @@ ProcXIChangeHierarchy(ClientPtr client) } rc = dixLookupDevice(&newkeybd, r->return_keyboard, - client, DixWriteAccess); + client, DixAddAccess); if (rc != Success) goto unwind; @@ -415,7 +415,7 @@ ProcXIChangeHierarchy(ClientPtr client) DeviceIntPtr *xtstdevice; rc = dixLookupDevice(&ptr, c->deviceid, client, - DixWriteAccess); + DixManageAccess); if (rc != Success) goto unwind; @@ -448,7 +448,7 @@ ProcXIChangeHierarchy(ClientPtr client) DeviceIntPtr *xtstdevice; rc = dixLookupDevice(&ptr, c->deviceid, client, - DixWriteAccess); + DixManageAccess); if (rc != Success) goto unwind; @@ -471,7 +471,7 @@ ProcXIChangeHierarchy(ClientPtr client) } rc = dixLookupDevice(&newmaster, c->new_master, - client, DixWriteAccess); + client, DixAddAccess); if (rc != Success) goto unwind; if (!IsMaster(newmaster)) |