Adam Jackson
e8a45d97d3
Death to APPGROUP.
...
(cherry picked from commit eafaf40fb3
)
2009-02-24 22:24:03 -08:00
Jeremy Huddleston
e013272fa8
Transport/Apple: Add TRANS_NOXAUTH to incoming connections when the listener is flagged as such
...
(cherry picked from commit ba4a792426
)
2008-08-14 09:12:59 -07:00
Jeremy Huddleston
90156c29ca
Cleaned up #ifdef HAVE_LAUNCHDs that got messed up in the merge.
2008-08-06 10:19:17 -07:00
Jeremy Huddleston
90f1024dc2
Fixed bitwise or-and typo in my last commit.
...
(cherry picked from commit 3ec2349760
)
2008-08-06 10:08:46 -07:00
Jeremy Huddleston
dfcf7f0db7
XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
...
(cherry picked from commit 672682ebf9
)
2008-08-05 18:41:44 -07:00
Jeremy Huddleston
605a1d1067
XQuartz: Add the launchd fd to AllSockets as well
...
(cherry picked from commit 83f7252939
)
2008-05-23 02:31:09 -07:00
Jeremy Huddleston
18a8825adc
XQuartz: Cleaned up ListenOnOpenFD...
...
(cherry picked from commit 6fb587d3d5
)
2008-05-18 23:32:53 -07:00
Jeremy Huddleston
1f4d224f82
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
...
(cherry picked from commit 543c2cd68d
)
2008-05-17 14:55:31 -07:00
George Sapountzis
3d64290547
clean some "unused" warnings
2008-03-01 19:49:24 +02:00
Daniel Stone
b2f6cd290c
OS: Don't leak connection translation table on regeneration
2007-12-28 15:51:36 +02:00
Eamon Walsh
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Rich Coe
b7f3618f39
OS: Connection: Keep trying select while it gets interrupted (bug #9240 )
...
If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
than shutting clients down on either of these errors.
2007-12-05 19:36:37 +00:00
Rich Coe
d8b2cad377
OS: Connection: Don't shut down disappeared clients (bug #7876 )
...
If a client disappears in the middle of CheckConnections (presumably
because its appgroup leader disappears), then don't attempt to shut it down
a second time, when it's already vanished.
2007-12-05 19:31:07 +00:00
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Adam Jackson
f01e149d1a
Move SIGUSR1 notification as late as possible.
...
If we inherited a signal mask from the parent process that ignores SIGUSR1,
then we will send SIGUSR1 to the parent to indicate when we're ready to
accept connections. Unfortunately, we send this notification way too
early, right after creating the sockets rather than just before entering
the main loop.
Move it to just before Dispatch() so we're not lying quite so much.
2007-11-02 11:54:16 -04:00
Eamon Walsh
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
Alan Coopersmith
2d93e69690
Rework local client id finding code to be more uniform
2007-09-27 16:47:32 -07:00
Eamon Walsh
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
Ben Byer
bf1641b94c
XDARWIN: Add launchd support
...
This adds a bit of glue to configure.ac to support launchd detection;
on OS X (or other platforms which choose to implement launchd), this allows
the system to automagically start the Xserver as necessary to serve clients.
2007-09-05 20:34:25 -07:00
Eamon Walsh
568ae737d1
xace: add hooks + new access codes: core protocol server requests
2007-08-16 10:33:58 -04:00
Eamon Walsh
375864cb74
security: drop support for XC-QUERY-SECURITY authorization method.
2007-08-03 13:23:34 -04:00
Adam Jackson
f7f3fe7fe7
Remove the remnants of OS/2 support.
...
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
2007-06-28 18:59:05 -04:00
Alan Coopersmith
9725516b42
Split checks for dtrace & getpeerucred()
2007-06-26 18:55:36 -07:00
Adam Jackson
9a0f25de7c
Static cleanups, dead code deletion.
2007-03-25 12:27:01 -04:00
Daniel Stone
811675733e
os: fix client privates leak
...
Minor leak here. Oops.
2007-02-15 19:09:00 +02:00
Eamon Walsh
f44f14fe56
Define calls away when not building XACE, allowing ifdef's to be removed.
2006-12-01 21:15:41 -05:00
Rich Coe
b5d09d4adb
CheckConnections: don't close down the server client (bug #7876 )
...
When an appgroup is shutting down, the list of clients can change, so make
sure we're not trying to shut the server down.
2006-11-08 18:10:14 +02:00
Daniel Stone
578899139f
RemoveGeneralSocket: don't touch EnabledDevices
...
RemoveGeneralSocket. Harmless, but.
2006-11-08 15:29:15 +02:00
Alan Coopersmith
49a26681b2
Add DTrace probe points for X server <-> client communications
...
See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 12:54:43 -08:00
Daniel Stone
4843d823f4
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-11-02 03:18:13 +02:00
Alan Coopersmith
a7b944f0d9
If getpeerucred() is available, include pid & zoneid in audit messages too
2006-11-01 16:17:49 -08:00
Alan Coopersmith
fbfb35189e
Bug #1997 : AUDIT messages should contain uid for local accesses
...
<https://bugs.freedesktop.org/show_bug.cgi?id=1997 >
2006-11-01 15:11:48 -08:00
Daniel Stone
335b503c5e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-13 18:10:45 +03:00
Alan Coopersmith
c2535f6792
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-10 10:37:59 -07:00
Daniel Stone
7465010d59
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-21 19:05:41 -04:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Daniel Stone
02a9531156
add basic D-BUS configuration mechanism
...
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
2006-07-21 15:19:49 -04:00
Alan Coopersmith
90af38fa0c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
Xext/appgroup.c
2006-06-21 16:23:31 -07:00
Alan Coopersmith
77c947b900
Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h
...
(Since all use is inside the xserver module, might as well keep the header
in the Xserver module instead of in proto/XExt to allow easier synchronization
of updates.)
2006-06-21 16:18:41 -07:00
Alan Coopersmith
a46c06dab8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
Xext/appgroup.c
Xext/security.c
dix/devices.c
dix/dispatch.c
dix/dixutils.c
dix/events.c
dix/extension.c
dix/property.c
dix/window.c
os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith
d44b2a0a57
Move Xserver API for security extension to securitysrv.h
2006-06-20 18:22:51 -07:00
Eamon Walsh
37f0ae0245
Replace XC-SECURITY code with XACE security hooks
...
(cherry picked from 8526cd6395
commit)
2006-06-19 17:09:37 -07:00
Daniel Stone
a9ed5a8790
Kill LBX, too.
2006-06-01 22:06:41 +00:00
Adam Jackson
7deaaa797c
Big old pile of warning fixes.
2006-03-28 01:21:00 +00:00
Adam Jackson
f105b8da11
Mark everything in dixsym.c as _X_EXPORT.
2006-02-15 20:44:13 +00:00
Daniel Stone
0bb669638f
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
2005-07-03 08:53:54 +00:00
Daniel Stone
e03198972c
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
...
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
Harold L Hunt II
6700847458
Fix comments for pointers in parameter lists to work with fussy compilers
2005-05-02 22:01:08 +00:00
Daniel Stone
292c4cff26
Fix includes right throughout the Xserver tree:
...
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00