andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xselinux: Use xace Xtrans wrappers instead of the now-inaccessible wrapees.

Browse Source
This commit is contained in:
Eamon Walsh 2008-12-18 13:59:36 -05:00
parent f87e66486c
commit 5d065a8890
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xext/xselinux.c
View File

@ -50,9 +50,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "selection.h" #include "selection.h"
#include "xacestr.h" #include "xacestr.h"
#include "xselinux.h" #include "xselinux.h"
#define XSERV_t
#define TRANS_SERVER
#include <X11/Xtrans/Xtrans.h>
#include "../os/osdep.h" #include "../os/osdep.h"
#include "modinit.h" #include "modinit.h"
@ -460,8 +457,7 @@ SELinuxDoCheck(SELinuxSubjectRec *subj, SELinuxObjectRec *obj,
static void static void
SELinuxLabelClient(ClientPtr client) SELinuxLabelClient(ClientPtr client)
{ {
XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn; int fd = XaceGetConnectionNumber(client);
int fd = _XSERVTransGetConnectionNumber(ci);
SELinuxSubjectRec *subj; SELinuxSubjectRec *subj;
SELinuxObjectRec *obj; SELinuxObjectRec *obj;
security_context_t ctx; security_context_t ctx;
@ -479,7 +475,7 @@ SELinuxLabelClient(ClientPtr client)
} }
/* For local clients, try and determine the executable name */ /* For local clients, try and determine the executable name */
if (_XSERVTransIsLocal(ci)) { if (XaceIsLocal(client)) {
struct ucred creds; struct ucred creds;
socklen_t len = sizeof(creds); socklen_t len = sizeof(creds);
char path[PATH_MAX + 1]; char path[PATH_MAX + 1];