[PULL] xorg suid wrapper + fd sharing support for server managed fds

Hans de Goede hdegoede at redhat.com
Sat Mar 15 02:40:04 PDT 2014


Hi Keith,

Please pull from my tree for the patch adding a xorg suid wrapper +
a patch-set adding support for having a set of input-devices sharing
the same device node and thus the same fd (this is necessary for
wacom tablets).

Note this supercedes my previous pull-req for just the suid wrapper.

The following changes since commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4:

   Merge remote-tracking branch 'whot/for-keith' (2014-03-11 22:04:36 -0700)

are available in the git repository at:


   git://people.freedesktop.org/~jwrdegoede/xserver for-keith

for you to fetch changes up to 2b77b208daf9402472ba7fb709156a14eb487299:

   xf86Xinput: release server managed fd before removing the device from the list (2014-03-13 13:11:55 +0100)

----------------------------------------------------------------
Hans de Goede (8):
       Xorg: Add a suid root wrapper
       config_odev*: Use XNF alloc functions
       Remove config_odev_add_*attribute checks in various places
       systemd_logind_find_info_ptr_by_devnum: Add a start argument
       systemd_logind_find_info_ptr_by_devnum: Move to higher inside the file
       systemd-logind: Add a systemd_logind_set_input_fd_for_all_devs helper
       systemd-logind: Correctly deal with InputDevs sharing a device-node
       xf86Xinput: release server managed fd before removing the device from the list

  config/config.c                              |  18 +--
  config/udev.c                                |  32 +---
  configure.ac                                 |  14 +-
  hw/xfree86/Makefile.am                       |  15 +-
  hw/xfree86/Xorg.sh.in                        |  11 ++
  hw/xfree86/common/xf86Xinput.c               |  10 +-
  hw/xfree86/common/xf86platformBus.h          |   5 +-
  hw/xfree86/man/Makefile.am                   |   5 +
  hw/xfree86/man/Xorg.wrap.man                 |  67 ++++++++
  hw/xfree86/man/Xwrapper.config.man           |   1 +
  hw/xfree86/os-support/linux/lnx_platform.c   |   5 +-
  hw/xfree86/os-support/linux/systemd-logind.c |  90 ++++++++---
  hw/xfree86/xorg-wrapper.c                    | 231 +++++++++++++++++++++++++++
  include/dix-config.h.in                      |   6 +
  include/hotplug.h                            |   3 +
  include/xwin-config.h.in                     |   3 -
  manpages.am                                  |   1 +
  17 files changed, 435 insertions(+), 82 deletions(-)
  create mode 100644 hw/xfree86/Xorg.sh.in
  create mode 100644 hw/xfree86/man/Xorg.wrap.man
  create mode 100644 hw/xfree86/man/Xwrapper.config.man
  create mode 100644 hw/xfree86/xorg-wrapper.c

Thanks & Regards,

Hans


More information about the xorg-devel mailing list