Jeremy Huddleston
3ec2349760
Fixed bitwise or-and typo in my last commit.
2008-08-06 10:06:09 -07:00
Jeremy Huddleston
672682ebf9
XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
2008-08-05 18:38:30 -07:00
Jeremy Huddleston
83f7252939
XQuartz: Add the launchd fd to AllSockets as well
2008-05-23 02:10:14 -07:00
Jeremy Huddleston
6fb587d3d5
XQuartz: Cleaned up ListenOnOpenFD...
2008-05-18 23:31:41 -07:00
Jeremy Huddleston
543c2cd68d
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
2008-05-15 09:55:17 -07:00
Jeremy Huddleston
c9dff90ce8
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
2008-01-03 13:26:22 -08:00
Daniel Stone
38d8cfaaff
OS: Don't leak connection translation table on regeneration
...
(cherry picked from commit e868e0bc0d2318e62707d3ae68532b0029959154)
2007-12-28 15:50:56 +02:00
Jeremy Huddleston
4ae5621664
Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
2007-12-07 14:14:32 -08:00
Rich Coe
259f86b13b
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.
(cherry picked from commit b7f3618f39
)
2007-12-06 00:30:01 +00:00
Rich Coe
90649e6a39
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.
(cherry picked from commit d8b2cad377
)
2007-12-06 00:30:01 +00:00
Ben Byer
120e831640
More patches from downstream
2007-11-20 03:01:12 -08: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
Alexander Gottwald
0f7874cbfc
Use a simple hashtable as ConnectionTranslation instead of a plain array on
...
Windows because socket fds are not sequential and do not start at 0
2004-11-22 13:23:25 +00:00
Alexander Gottwald
9826b83826
Bufzilla #1802 , http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
...
mingw (Win32) port
2004-11-15 15:06:51 +00:00
Matthieu Herrb
9a0cf1eb43
Remove some remaining AMOEBA specific code.
2004-10-17 10:46:14 +00:00
Egbert Eich
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
Egbert Eich
dae90c3af9
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2004-03-14 08:34:49 +00:00
Egbert Eich
867451f1ab
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
2004-03-03 12:12:50 +00:00
Egbert Eich
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
Egbert Eich
147aae87fd
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
2004-02-26 09:23:53 +00:00
Kaleb Keithley
adc7f9a4eb
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
2003-11-25 19:29:01 +00:00
Kaleb Keithley
d568221710
XFree86 4.3.0.1
2003-11-14 16:49:22 +00:00