svn merge ^/branches/released .

3 files changed, 16 insertions, 320 deletions

diff --git a/xorg-server/Xext/Makefile.am b/xorg-server/Xext/Makefile.am
index 8a604c3e7..cb47d38cc 100644
--- a/xorg-server/Xext/Makefile.am
+++ b/xorg-server/Xext/Makefile.am
@@ -94,12 +94,6 @@ if XCSECURITY
 BUILTIN_SRCS += $(XCSECURITY_SRCS)

 endif

 

-XCALIBRATE_SRCS = xcalibrate.c

-if XCALIBRATE

-BUILTIN_SRCS += $(XCALIBRATE_SRCS)

-# XCalibrate needs tslib

-endif

-

 # XF86 Big Font extension

 BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h

 if XF86BIGFONT

@@ -132,7 +126,6 @@ EXTRA_DIST = \
 	$(XACE_SRCS) \

 	$(XCSECURITY_SRCS) \

 	$(XSELINUX_SRCS) \

-	$(XCALIBRATE_SRCS) \

 	$(XINERAMA_SRCS) \

 	$(BIGFONT_SRCS) \

 	$(DPMS_SRCS) \

diff --git a/xorg-server/Xext/xcalibrate.c b/xorg-server/Xext/xcalibrate.c
deleted file mode 100644
index a16c11bab..000000000
--- a/xorg-server/Xext/xcalibrate.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*

- * Copyright © 2003 Philip Blundell

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Philip Blundell not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Philip Blundell makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_KDRIVE_CONFIG_H

-#include <kdrive-config.h>

-#endif

-

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "os.h"

-#include "dixstruct.h"

-#include "extnsionst.h"

-#include "swaprep.h"

-#include "protocol-versions.h"

-

-#include <X11/extensions/xcalibrateproto.h>

-#include <X11/extensions/xcalibratewire.h>

-

-extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);

-extern void *tslib_raw_event_closure;

-

-static CARD8	XCalibrateReqCode;

-int		XCalibrateEventBase;

-int		XCalibrateReqBase;

-int		XCalibrateErrorBase;

-

-static ClientPtr xcalibrate_client;

-

-static void

-xcalibrate_event_hook (int x, int y, int pressure, void *closure)

-{

-  ClientPtr pClient = (ClientPtr) closure;

-  xXCalibrateRawTouchscreenEvent	ev;

-

-  ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;

-  ev.x = x;

-  ev.y = y;

-  ev.pressure = pressure;

-

-  WriteEventsToClient (pClient, 1, (xEvent *) &ev);

-}

-

-static int

-ProcXCalibrateQueryVersion (ClientPtr client)

-{

-  REQUEST(xXCalibrateQueryVersionReq);

-  xXCalibrateQueryVersionReply rep;

-  CARD16 client_major, client_minor;  /* not used */

-

-  REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);

-

-  client_major = stuff->majorVersion;

-  client_minor = stuff->minorVersion;

-

-  fprintf(stderr, "%s(): called\n", __func__); 

-

-  rep.type = X_Reply;

-  rep.length = 0;

-  rep.sequenceNumber = client->sequence;

-  rep.majorVersion = SERVER_XCALIBRATE_MAJOR_VERSION;

-  rep.minorVersion = SERVER_XCALIBRATE_MINOR_VERSION;

-  if (client->swapped) { 

-    int n;

-    swaps(&rep.sequenceNumber, n);

-    swapl(&rep.length, n);     

-    swaps(&rep.majorVersion, n);

-    swaps(&rep.minorVersion, n);

-  }

-  WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep);

-  return Success;

-}

-

-static int

-SProcXCalibrateQueryVersion (ClientPtr client)

-{

-    REQUEST(xXCalibrateQueryVersionReq);

-    int n;

-

-    REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);

-    swaps(&stuff->majorVersion,n);

-    swaps(&stuff->minorVersion,n);

-    return ProcXCalibrateQueryVersion(client);

-}

-

-static int

-ProcXCalibrateSetRawMode (ClientPtr client)

-{

-  REQUEST(xXCalibrateRawModeReq);

-  xXCalibrateRawModeReply rep;

-

-  REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);

-

-  memset (&rep, 0, sizeof (rep));

-  rep.type = X_Reply;

-  rep.sequenceNumber = client->sequence;

-

-  if (stuff->on)

-    {

-      if (xcalibrate_client == NULL)

-	{

-	  /* Start calibrating.  */

-	  xcalibrate_client = client;

-	  tslib_raw_event_hook = xcalibrate_event_hook;

-	  tslib_raw_event_closure = client;

-	  rep.status = GrabSuccess;

-	}

-      else

-	{

-	  rep.status = AlreadyGrabbed;

-	}

-    }

-  else

-    {

-      if (xcalibrate_client == client)

-	{

-	  /* Stop calibrating.  */

-	  xcalibrate_client = NULL;

-	  tslib_raw_event_hook = NULL;

-	  tslib_raw_event_closure = NULL;

-	  rep.status = GrabSuccess;

-

-	  /* Cycle input off and on to reload configuration.  */

-	  KdDisableInput ();

-	  KdEnableInput ();

-	}

-      else

-	{

-	  rep.status = AlreadyGrabbed;

-	}

-    }

-

-  if (client->swapped)

-    {

-      int n;

-

-      swaps (&rep.sequenceNumber, n);

-      swaps (&rep.status, n);

-    }

-  WriteToClient(client, sizeof (rep), (char *) &rep);

-  return Success;

-}

-

-static int

-SProcXCalibrateSetRawMode (ClientPtr client)

-{

-  REQUEST(xXCalibrateRawModeReq);

-  int n;

-

-  REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);

-

-  swaps(&stuff->on, n);

-

-  return ProcXCalibrateSetRawMode(client);

-}

-

-static int

-ProcXCalibrateScreenToCoord (ClientPtr client)

-{

-  REQUEST(xXCalibrateScreenToCoordReq);

-  xXCalibrateScreenToCoordReply rep;

-

-  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);

-

-  memset (&rep, 0, sizeof (rep));

-  rep.type = X_Reply;

-  rep.sequenceNumber = client->sequence;

-  rep.x = stuff->x;

-  rep.y = stuff->y;

-

-  KdScreenToPointerCoords(&rep.x, &rep.y);

-

-  if (client->swapped)

-    {

-      int n;

-

-      swaps (&rep.x, n);

-      swaps (&rep.y, n);

-    }

-  WriteToClient(client, sizeof (rep), (char *) &rep);

-  return Success;

-}

-

-static int

-SProcXCalibrateScreenToCoord (ClientPtr client)

-{

-  REQUEST(xXCalibrateScreenToCoordReq);

-  int n;

-

-  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);

-

-  swaps(&stuff->x, n);

-  swaps(&stuff->y, n);

-

-  return ProcXCalibrateScreenToCoord(client);

-}

-

-static int

-ProcXCalibrateDispatch (ClientPtr client)

-{

-    REQUEST(xReq);

-    switch (stuff->data) {

-    case X_XCalibrateQueryVersion:

-        return ProcXCalibrateQueryVersion(client);

-    case X_XCalibrateRawMode:

-        return ProcXCalibrateSetRawMode(client);

-    case X_XCalibrateScreenToCoord:

-        return ProcXCalibrateScreenToCoord(client);

-

-    default: break;

-    }

-

-    return BadRequest;

-}

-

-static int

-SProcXCalibrateDispatch (ClientPtr client)

-{

-    REQUEST(xReq);

-    int n;

-

-    swaps(&stuff->length,n);

-

-    switch (stuff->data) {

-    case X_XCalibrateQueryVersion:

-        return SProcXCalibrateQueryVersion(client);

-    case X_XCalibrateRawMode:

-        return SProcXCalibrateSetRawMode(client);

-    case X_XCalibrateScreenToCoord:

-        return SProcXCalibrateScreenToCoord(client);

-

-    default: break;

-    }

-

-    return BadRequest;

-}

-

-static void

-XCalibrateClientCallback (CallbackListPtr	*list,

-			  pointer		closure,

-			  pointer		data)

-{

-    NewClientInfoRec	*clientinfo = (NewClientInfoRec *) data;

-    ClientPtr		pClient = clientinfo->client;

-

-    if (clientinfo->setup == NULL

-	&& xcalibrate_client != NULL

-	&& xcalibrate_client == pClient)

-      {

-	/* Stop calibrating.  */

-	xcalibrate_client = NULL;

-	tslib_raw_event_hook = NULL;

-	tslib_raw_event_closure = NULL;

-      }

-}

-

-void

-XCalibrateExtensionInit(void)

-{

-  ExtensionEntry *extEntry;

-

-  if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0))

-    return;  

-

-  extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,

-			  ProcXCalibrateDispatch, SProcXCalibrateDispatch,

-			  NULL, StandardMinorOpcode);

-

-  if (!extEntry)

-    return;

-

-  XCalibrateReqCode = (unsigned char)extEntry->base;

-  XCalibrateEventBase = extEntry->eventBase;

-  XCalibrateErrorBase = extEntry->errorBase;

-

-  xcalibrate_client = 0;

-}

diff --git a/xorg-server/Xext/xselinux_hooks.c b/xorg-server/Xext/xselinux_hooks.c
index 57e49c090..1c048bd68 100644
--- a/xorg-server/Xext/xselinux_hooks.c
+++ b/xorg-server/Xext/xselinux_hooks.c
@@ -40,6 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "propertyst.h"

 #include "extnsionst.h"

 #include "xacestr.h"

+#include "client.h"

 #include "../os/osdep.h"

 #define _XSELINUX_NEED_FLASK_MAP

 #include "xselinuxint.h"

@@ -129,26 +130,25 @@ SELinuxLabelClient(ClientPtr client)
 

     /* For local clients, try and determine the executable name */

     if (XaceIsLocal(client)) {

-	struct ucred creds;

-	socklen_t len = sizeof(creds);

-	char path[PATH_MAX + 1];

-	size_t bytes;

-

-	memset(&creds, 0, sizeof(creds));

-	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0)

-	    goto finish;

+	/* Get cached command name if CLIENTIDS is enabled. */

+	const char *cmdname = GetClientCmdName(client);

+	Bool cached = (cmdname != NULL);

+	/* If CLIENTIDS is disabled, figure out the command name from

+	 * scratch. */

+	if (!cmdname)

+	{

+	    pid_t pid = DetermineClientPid(client);

+	    if (pid != -1)

+		DetermineClientCmd(pid, &cmdname, NULL);

+	}

 

-	snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid);

-	fd = open(path, O_RDONLY);

-	if (fd < 0)

+	if (!cmdname)

 	    goto finish;

 

-	bytes = read(fd, path, PATH_MAX + 1);

-	close(fd);

-	if (bytes <= 0)

-	    goto finish;

+	strncpy(subj->command, cmdname, COMMAND_LEN - 1);

 

-	strncpy(subj->command, path, COMMAND_LEN - 1);

+	if (!cached)

+	    free((void *) cmdname); /* const char * */

     }

 

 finish: