From 239fe3d0802b12ce8947741693244ff8154fa559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rami=20Ylim=C3=A4ki?= <rami.ylimaki@vincit.fi>
Date: Wed, 15 Feb 2017 16:42:14 +0100
Subject: os: Add facilities for client ID tracking.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 commit 6d6d4cb6043905d850834946e9bfc526ed5a9ef7
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Mon Jan 2 13:23:59 2012 +0000

    Add OpenBSD support to DetermineClientCmd()

    Uses kvm_getargv() from libkvm.

    Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
    Reviewed-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>

 commit cfc4c3d7fa8bd4da4c08b2ab8e6f85435f75353a
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Dec 24 10:00:56 2011 -0800

    Add Solaris support to DetermineClientCmd

    Uses /proc/pid/psinfo to read command & partial arguments.

    Moves cmdsize & argsize variables into non-Solaris #else clause
    to avoid unused variable warnings.

    Fixes format mismatch errors when building with DEBUG defined on
    a 64-bit platform (where Mask is defined as CARD32).

    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
    Signed-off-by: Keith Packard <keithp@keithp.com>

 commit 780133f9ae7fada462714b47e79d26075bbd9abe
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Oct 28 21:29:50 2011 -0700

    Convert DetermineClientCmd to use strdup instead of malloc+strncpy

    *cmdname is initialized to NULL earlier in the function, so it's
    okay to overwrite it with NULL if strdup fails, don't need that
    extra check.

    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>

 commit 2ef4ff45ef1fcfc4967ebe3d550408769e5f6500
 Author: Erkki Seppälä <erkki.seppala@vincit.fi>
 Date:   Fri Mar 25 10:38:23 2011 +0200

    os/client: Prevent rare fd leak in DetermineClientPid

    DetermineClientPid didn't close file descriptor if read on
    /proc/pid/cmdline failed. Adjusted the code to disregard the close
    return value and perform the return after that, if the read failed or
    returned EOF.

    Signed-off-by: Mark Kettenis <mark.kettenis@xs4all.nl>
    Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
    Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
    Signed-off-by: Keith Packard <keithp@keithp.com>

 commit 1e933665bef26c74196bb7c59910e6a78bcacf0e
 Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
 Date:   Wed Dec 22 16:51:09 2010 +0200

    os: Add facilities for client ID tracking.

    An interface is provided for figuring out the PID and process name of
    a client. Make some existing functionality from SELinux and IA
    extensions available for general use.

    Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
    Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>

 Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
 nx-X11/programs/Xserver/Imakefile | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'nx-X11/programs/Xserver/Imakefile')

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 2af91821d..745b26154 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -323,6 +323,15 @@ NXAGENTNXLIBS = -L../../../nxcomp  \
                 -lXcompshad \
                 -lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \
                 -lNX_X11 -lXext
+#elif defined(OpenBSDArchitecture)
+NXAGENTNXLIBS = -L../../../nxcomp  \
+                -L../../../nx-X11/exports/lib \
+                -L../../../nxcompshad \
+                -lkvm \
+                -lXcomp \
+                -lXcompshad \
+                -lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
+                -lNX_X11 -lXext
 #else
 NXAGENTNXLIBS = -L../../../nxcomp  \
                 -L../../../nx-X11/exports/lib \
-- 
cgit v1.2.3