6604583 TsolExtensionInit: cannot load X Trusted Extensions error message showing up when time server starts
6586710 reference to PanoramiXGetInputFocus() in /usr/X11R6/lib/modules/extensions/libxtsol.so
--- a/open-src/xserver/xorg/sun-src/tsol/tsolextension.c Tue Oct 02 10:48:46 2007 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolextension.c Wed Oct 03 15:57:38 2007 -0700
@@ -237,10 +237,8 @@
/* sleep(20); */
- /* Extension can be loaded on a Trusted Solaris system only */
+ /* This extension is supported on a labeled system */
if (!is_system_labeled()) {
- ErrorF("TsolExtensionInit: cannot load X Trusted Extensions\n");
- ErrorF("Trusted Extensions is not enabled/installed on your system\n");
return;
}
--- a/open-src/xserver/xorg/sun-src/tsol/tsolprotocol.c Tue Oct 02 10:48:46 2007 -0700
+++ b/open-src/xserver/xorg/sun-src/tsol/tsolprotocol.c Wed Oct 03 15:57:38 2007 -0700
@@ -1939,10 +1939,7 @@
FocusClassPtr focus = inputInfo.keyboard->focus;
REQUEST_SIZE_MATCH(xReq);
-#ifdef PANORAMIX
- if ( !noPanoramiXExtension )
- return PanoramiXGetInputFocus(client);
-#endif
+
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;