diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-12-18 13:59:36 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-12-18 14:01:10 -0500 |
| commit | 5d065a889074558634216eebd4bba35a60db9a09 (patch) | |
| tree | bdd52fbddbdf147046c15b9d657feda97fb47e4c /Xext | |
| parent | f87e66486c3610c56888915b66ae5ab0af03da8b (diff) | |
xselinux: Use xace Xtrans wrappers instead of the now-inaccessible wrapees.
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/xselinux.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 93ea05b92..e2eeac961 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -50,9 +50,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "selection.h" #include "xacestr.h" #include "xselinux.h" -#define XSERV_t -#define TRANS_SERVER -#include <X11/Xtrans/Xtrans.h> #include "../os/osdep.h" #include "modinit.h" @@ -460,8 +457,7 @@ SELinuxDoCheck(SELinuxSubjectRec *subj, SELinuxObjectRec *obj, static void SELinuxLabelClient(ClientPtr client) { - XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn; - int fd = _XSERVTransGetConnectionNumber(ci); + int fd = XaceGetConnectionNumber(client); SELinuxSubjectRec *subj; SELinuxObjectRec *obj; security_context_t ctx; @@ -479,7 +475,7 @@ SELinuxLabelClient(ClientPtr client) } /* For local clients, try and determine the executable name */ - if (_XSERVTransIsLocal(ci)) { + if (XaceIsLocal(client)) { struct ucred creds; socklen_t len = sizeof(creds); char path[PATH_MAX + 1]; |