components/x11/xorg-server/patches/01-osaudit.patch

   1 #
   2 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   3 #
   4 # Permission is hereby granted, free of charge, to any person obtaining a
   5 # copy of this software and associated documentation files (the "Software"),
   6 # to deal in the Software without restriction, including without limitation
   7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   8 # and/or sell copies of the Software, and to permit persons to whom the
   9 # Software is furnished to do so, subject to the following conditions:
  10 #
  11 # The above copyright notice and this permission notice (including the next
  12 # paragraph) shall be included in all copies or substantial portions of the
  13 # Software.
  14 #
  15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  21 # DEALINGS IN THE SOFTWARE.
  22 #
  23
  24 7010804 Xorg should audit connections and disconnections.
  25
  26 diff --git a/configure.ac b/configure.ac
  27 index 67b1eb4..77ad53d 100644
  28 --- a/configure.ac
  29 +++ b/configure.ac
  30 @@ -309,6 +309,12 @@ AC_CHECK_HEADER([execinfo.h],[
  31      ])]
  32  )
  33
  34 +# Solaris auditing
  35 +AC_CHECK_LIB([bsm], [adt_start_session], [HAVE_LIBBSM=yes ; SYS_LIBS=-lbsm ;
  36 +    AC_DEFINE([HAVE_LIBBSM], [],
  37 +        [Define to 1 if you have the Solaris auditing library (-lbsm)])])
  38 +AM_CONDITIONAL([HAVE_LIBBSM], [test "x$HAVE_LIBBSM" = xyes])
  39 +
  40  dnl ---------------------------------------------------------------------------
  41  dnl Bus options and CPU capabilities.  Replaces logic in
  42  dnl hw/xfree86/os-support/bus/Makefile.am, among others.
  43 diff --git a/dix/main.c b/dix/main.c
  44 index fb935c9..e2ec177 100644
  45 --- a/dix/main.c
  46 +++ b/dix/main.c
  47 @@ -201,6 +201,7 @@ main(int argc, char *argv[], char *envp[])
  48          dixResetRegistry();
  49          ResetFontPrivateIndex();
  50          InitCallbackManager();
  51 +        OSAuditInit(); /* Must be after InitCallbackManager() */
  52          InitOutput(&screenInfo, argc, argv);
  53
  54          if (screenInfo.numScreens < 1)
  55 diff --git a/include/dix-config.h.in b/include/dix-config.h.in
  56 index 578f249..8acca13 100644
  57 --- a/include/dix-config.h.in
  58 +++ b/include/dix-config.h.in
  59 @@ -115,6 +115,9 @@
  60  /* Build a standalone xpbproxy */
  61  #undef STANDALONE_XPBPROXY
  62
  63 +/* Define to 1 if you have the Solaris BSM auditing library (-lbsm) */
  64 +#undef HAVE_LIBBSM
  65 +
  66  /* Define to 1 if you have the `m' library (-lm). */
  67  #undef HAVE_LIBM
  68
  69 diff --git a/include/os.h b/include/os.h
  70 index 9e323f3..01cea99 100644
  71 --- a/include/os.h
  72 +++ b/include/os.h
  73 @@ -680,4 +680,8 @@ LogPrintMarkers(void);
  74  extern _X_EXPORT void
  75  xorg_backtrace(void);
  76
  77 +/* in osaudit.c */
  78 +extern void
  79 +OSAuditInit (void);
  80 +
  81  #endif                          /* OS_H */
  82 diff --git a/os/Makefile.am b/os/Makefile.am
  83 index 8891485..c4825ad 100644
  84 --- a/os/Makefile.am
  85 +++ b/os/Makefile.am
  86 @@ -15,6 +15,7 @@ libos_la_SOURCES =    \
  87         connection.c    \
  88         io.c            \
  89         mitauth.c       \
  90 +       osaudit.c       \
  91         oscolor.c       \
  92         osdep.h         \
  93         osinit.c        \