Commit Graph

220 Commits

Author SHA1 Message Date
Stefan Huehner
1f6741db19 Bug #10560: Code-Cleanup: function declarations () -> (void)
X.Org Bugzilla #10560: <https://bugs.freedesktop.org/show_bug.cgi?id=10560>
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511>
2007-04-09 14:33:15 -07:00
Eamon Walsh
cf962a849d Merge branch 'master' into XACE-SELINUX
Conflicts:

	configure.ac
2007-04-05 14:41:39 -04:00
Eamon Walsh
1cb84768f3 security: rewrite to use new devPrivates support. 2007-04-03 15:31:16 -04:00
Matthieu Herrb
645d87cf8e CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption 2007-04-03 15:47:18 +02:00
Eamon Walsh
327bc332a6 xace: minor comment fixes. 2007-03-28 13:00:03 -04:00
Eamon Walsh
0331c6a8fc Merge branch 'master' into XACE-SELINUX 2007-03-26 10:28:05 -04:00
Adam Jackson
04b87d6dfa Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00
Eamon Walsh
84a066cc88 xace: pass serverClient as default argument to dixChangeWindowProperty
instead of NullClient.
2007-03-23 10:33:53 -04:00
Eamon Walsh
e1cc68add0 xace: drop the name argument from the property callback. 2007-03-22 17:33:16 -04:00
Eamon Walsh
1b766ffc06 dix: reorganize property code to better support xace hook; requires new API for
changing a property, dixChangeWindowProperty, taking an additional client argument.
2007-03-22 15:55:35 -04:00
Eamon Walsh
1b58304ac8 xace: add new argument to property hook for property structure itself. 2007-03-22 14:07:01 -04:00
Eamon Walsh
a3296d111d xace: add access_mode argument to selection hook. 2007-03-21 17:01:26 -04:00
Eamon Walsh
4fa482b4be xace: bump major version since the hooks have changed. 2007-03-21 14:49:56 -04:00
Eamon Walsh
9c144f8ac5 xace: add XACE_SELECTION_ACCESS hook for selection redirection/access. 2007-03-21 14:39:00 -04:00
Adam Jackson
021fc5cb2c Static markup and dead code cull over xkb/.
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header.  Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
2007-03-20 18:37:02 -04:00
Eamon Walsh
2945deba1d xace: drop XACE_WINDOW_INIT hook, it has been superseded by ResourceStateCallback. 2007-03-19 17:09:10 -04:00
Eamon Walsh
78c962da76 xselinux: use the new ResourceStateCallback instead of the XACE_WINDOW_INIT hook. 2007-03-19 17:04:51 -04:00
Eamon Walsh
6a89106e9c xselinux + security: remove confusing CALLBACK macro. 2007-03-19 16:51:29 -04:00
Eamon Walsh
18339375cd xselinux: remove context validation function for now. 2007-03-08 12:14:06 -05:00
Eamon Walsh
bb111291d8 Merge branch 'master' into XACE-SELINUX 2007-03-07 09:03:46 -05:00
Eamon Walsh
a7cd53deb9 remove PIXPRIV checks as this flag is always set. 2007-03-06 17:05:03 -05:00
Eamon Walsh
23fc429aad Merge branch 'master' into XACE-SELINUX 2007-03-05 12:18:54 -05:00
Peter Hutterer
68c64ad7b1 Xext: Update device's lastx/lasty when sending a motion event with XTest. 2007-03-01 09:59:37 +10:30
Eamon Walsh
c2f3f705f1 Bug #6988: Change behavior of Security extension per user feature request. 2007-02-15 14:38:24 -05:00
Eamon Walsh
04632835b7 Merge branch 'master' into my-XACE-SELINUX 2007-02-15 09:27:05 -05:00
Alan Coopersmith
b32a40817f Correct variable descriptions in comment for SecurityCheckResourceIDAccess 2007-01-24 16:29:49 -08:00
Eamon Walsh
88f89b9ac1 Policy updates: use x prefix in property and ext types. 2007-01-19 19:15:49 -05:00
Eamon Walsh
2fb8b7f819 Split ObjectSIDByLabel into two functions since property labeling now
involves an additional compute_create lookup.
2007-01-19 19:14:51 -05:00
Eamon Walsh
700fccf863 Remove the root window context line from the configuration file.
This context will be derived through a type_transition rule instead.
2007-01-19 14:56:38 -05:00
Eamon Walsh
3a9791b456 Policy updates. 2007-01-19 14:53:09 -05:00
Eamon Walsh
4b1c9ac3d1 Policy updates. 2006-12-22 13:04:50 -05:00
Eamon Walsh
cd71e86183 Naming change: Security*Access -> Dix*Access.
Clarify some error message strings.
2006-12-20 13:45:24 -05:00
Eamon Walsh
a81dbaae05 Merge branch 'master' into my-XACE-SELINUX 2006-12-19 16:11:19 -05:00
Eamon Walsh
ab1d5b0c31 Convert callers of LookupClient() to dixLookupClient(). 2006-12-15 17:26:58 -05:00
Eamon Walsh
10aabb729d Convert callers of LookupDrawable() to dixLookupDrawable(). 2006-12-15 16:36:29 -05:00
Eamon Walsh
25d5e0a629 Convert callers of SecurityLookupWindow() to dixLookupWindow(). 2006-12-15 15:50:46 -05:00
Eamon Walsh
04c721854f Convert callers of LookupWindow() to dixLookupWindow(). 2006-12-15 14:19:54 -05:00
Eamon Walsh
00f0705b3b Remove instances of macros SECURITY_VERIFY_GEOMETRABLE and SECURITY_VERIFY_GC. 2006-12-14 19:15:21 -05:00
Eamon Walsh
5e334f06a1 Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC. 2006-12-14 18:27:09 -05:00
Eamon Walsh
51b69ff499 Remove instances of macro SECURITY_VERIFY_DRAWABLE. 2006-12-14 17:53:43 -05:00
Eamon Walsh
0cf75e7432 Remove instances of macros LOOKUP_DRAWABLE and VERIFY_DRAWABLE. 2006-12-14 17:45:11 -05:00
Eamon Walsh
6c46645cfc Naming change: Security*Access -> Dix*Access 2006-12-14 14:45:42 -05:00
Eamon Walsh
fb6d676de5 Add xserver object class to list of object classes. 2006-12-12 16:17:51 -05:00
Eamon Walsh
7b90944258 Change MLS levels in config file contexts to more sane defaults. 2006-12-12 15:59:38 -05:00
Eamon Walsh
568c09481e Split AssignClientState() into two routines, new routine is server-specific. 2006-12-12 15:59:08 -05:00
Eamon Walsh
e124806994 Remove trailing whitespace (whitespace police). 2006-12-12 13:35:22 -05:00
Eamon Walsh
ca77c12107 Naming change: Security*Operation -> Xace*Operation 2006-12-12 13:27:03 -05:00
Eamon Walsh
a60da1db7c Add required root window context to config file. 2006-12-12 13:27:03 -05:00
Eamon Walsh
354c80da66 Improve error handling, messages during initialization. 2006-12-12 13:27:03 -05:00
Eamon Walsh
3714d91499 Experimental window property holding security context. 2006-12-12 13:27:03 -05:00
Eamon Walsh
7f16c38ae2 Add SELinux extension configure-time support. 2006-12-12 13:27:03 -05:00
Eamon Walsh
83aad2be8a Add SELinux extension source files. 2006-12-12 13:27:02 -05:00
Eamon Walsh
ac90ce58ba Naming change: Security*Operation -> Xace*Operation 2006-12-01 21:15:41 -05: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
Daniel Stone
8ba0c7b62c xace: avoid 'unused variable pScreen'
Initialise pScreen explicitly, as REGION_* macros ignore pScreen.
2006-11-08 15:29:16 +02:00
Eamon Walsh
3d39c02fe6 More work on Bug #8875: revert previous fix and try using client argument
instead of serverClient.  Also don't use totalClientSize as it is not
initialized until after the first call to InitClient.
2006-11-06 21:25:52 -05:00
Eamon Walsh
75fe0670eb whitespace adjust 2006-11-06 15:30:25 -05:00
Eamon Walsh
0539d9cf24 Bug #8875: Security extension causes Xorg to core dump on server reset 2006-11-06 15:29:17 -05:00
Eamon Walsh
49a70c8570 Merge branch 'master' into my-XACE-modular 2006-09-15 15:26:57 -04:00
Eamon Walsh
d1110c5c83 Generalize the handling of configuration files that ship with extensions. 2006-09-08 15:28:48 -04:00
Eamon Walsh
0fba09cdfc Include dix-config.h. 2006-09-08 15:23:06 -04:00
Eamon Walsh
c93877100e Don't need to allocate memory now that devPrivates are being used. 2006-09-08 15:21:57 -04:00
Michel Dänzer
f6ce0839ba Fix #include paths for fontcacheproto headers. 2006-09-06 13:18:02 +02:00
Eamon Walsh
0b81fccd2e Merge branch 'master' into my-XACE-modular
Conflicts:

	configure.ac
2006-09-05 18:03:25 -04:00
Matthew Allum
5ddbf4bcd4 Re-add support for tslib (1.0 release) and Xcalibrate extension. 2006-08-29 22:07:15 +01:00
Eamon Walsh
13c6713c82 Add four new XACE hooks: auditing, key event notification, window init 2006-08-25 18:17:01 -04:00
Eamon Walsh
52ba722e4c Merge branch 'XACE-modular' into my-XACE-modular 2006-08-21 18:49:31 -04: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
12dbd8a02f remove optional R3 backwards compatibility
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
2006-08-07 23:43:40 +03:00
Eamon Walsh
45c229f526 Remove LBX code. 2006-08-03 14:26:06 -04:00
Eamon Walsh
96e45626c4 Rebase Security extension to use devPrivates for storing security state. 2006-08-02 20:29:59 -04:00
Matthew Allum
02daa6bb10 Improve XRes to;
- Better estimate general pixmap memory usage.
 - Account for pixmaps shared between clients.
 - Account for window background and border pixmaps,
   and GC stripple and tile pixmaps.
2006-07-31 17:32:05 +01:00
Daniel Stone
bf2d7499c8 add securitysrv.h 2006-07-30 11:17:02 +03:00
Adam Jackson
0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Daniel Stone
f8a7a1e40c fix XEvIE build without XKB
Don't unconditionally play with XKB stuff in XEvIE.
2006-07-21 15:16:42 -04:00
Daniel Stone
84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Eamon Walsh
f83cee0338 Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE 2006-06-21 16:40:06 -07: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
Eamon Walsh
9af315a9be Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE 2006-06-20 19:03:05 -07:00
Alan Coopersmith
f68ecfa482 Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying
   to build XC-Security without X-ACE
 - Added XACE #define to dix-config.h
 - Added X-ACE sources to Xext/Makefile.am
2006-06-20 19:01:34 -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
Alan Coopersmith
a544359465 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:14:27 -07:00
Alan Coopersmith
63f6e6bbfd Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-20 16:03:34 -07:00
Alan Coopersmith
6df52fb774 Delete code that's been inside #if 0 since X11R6.7. 2006-06-20 16:02:55 -07:00
Eamon Walsh
227a319340 Add XACE extension source files.
(Copied from XACE-SELINUX branch in Xorg monolith CVS since these were never
 imported to modular cvs or git trees.)
2006-06-20 15:29:42 -07:00
Eamon Walsh
f818e0ab60 Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
(cherry picked from 0106715000 commit)
2006-06-19 17:24:30 -07:00
Adam Jackson
71fbda8049 Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
2006-06-18 21:07:28 -04:00
Greg Kroah-Hartman
96c19a3ec1 put function prototype for ShapeExtensionInit() in proper place
based on FIXME in mi/miinitext.c
2006-06-09 09:51:28 -07:00
Greg Kroah-Hartman
101ae61696 Add PanoramiXExtensionDisabledHack to globals.h as it was missing. 2006-06-07 12:06:22 -07:00
Greg Kroah-Hartman
e5b72bd9c6 Remove 3 compiler warnings in the Xext/xevie.c file 2006-06-07 12:05:39 -07:00
Daniel Stone
ee71cb61f8 Bug #6956: Fix crash when removing session leader before its children.
(Rich Coe)
2006-06-03 10:54:38 +00:00
Daniel Stone
a9ed5a8790 Kill LBX, too. 2006-06-01 22:06:41 +00:00
Daniel Stone
d81edb9e00 Forgot to remove this one too. 2006-06-01 19:22:01 +00:00
Daniel Stone
a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Søren Sandmann Pedersen
6558ba4e62 Fri May 12 17:51:26 2006 Søren Sandmann <sandmann@redhat.com>
Keep track of the previous item and update its next pointer when deleting
    from the linked list.
2006-05-12 21:53:28 +00:00
Fredrik Höglund
e1fc15a85f Put the screensaver extension back in the Xext module.
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
2006-04-05 21:08:45 +00:00
Adam Jackson
9b9dd747d8 Coverity #75: Dead variable elimination. 2006-04-03 02:13:47 +00:00
Adam Jackson
07ecf49521 Coverity #992: Prevent a NULL chase. 2006-04-03 01:28:11 +00:00