Attachment 94330 Details for Bug 75187 – patch 2/3: get_kinfo_proc(): add support for OpenBSD

[patch] patch 2/3: get_kinfo_proc(): add support for OpenBSD

0001-get_kinfo_proc-add-support-for-OpenBSD.patch (text/plain), 3.29 KB, created by Antoine Jacoutot on 2014-02-19 08:26:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Jacoutot

Created: 2014-02-19 08:26:50 UTC

Size: 3.29 KB

patch

obsolete

>From 4591d70e69276b4d3c4ba825458fd2c8800196e8 Mon Sep 17 00:00:00 2001
>From: Antoine Jacoutot <ajacoutot@gnome.org>
>Date: Wed, 19 Feb 2014 09:15:42 +0100
>Subject: [PATCH] get_kinfo_proc(): add support for OpenBSD
>
>---
> configure.ac                   |  3 +++
> src/polkit/polkitunixprocess.c | 46 ++++++++++++++++++++++++++++++++++++++----
> 2 files changed, 45 insertions(+), 4 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 0621d87..a2a866b 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -498,6 +498,9 @@ case "$host_os" in
>   *freebsd*)
>   	AC_DEFINE([HAVE_FREEBSD], 1, [Is this a FreeBSD system?])
> 	;;
>+  *openbsd*)
>+  	AC_DEFINE([HAVE_OPENBSD], 1, [Is this an OpenBSD system?])
>+ 	;;
> esac
> 
> GOBJECT_INTROSPECTION_CHECK([0.6.2])
>diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
>index 9d30cd2..315bd6c 100644
>--- a/src/polkit/polkitunixprocess.c
>+++ b/src/polkit/polkitunixprocess.c
>@@ -29,6 +29,10 @@
> #include <sys/sysctl.h>
> #include <sys/user.h>
> #endif
>+#ifdef HAVE_OPENBSD
>+#include <sys/param.h>
>+#include <sys/sysctl.h>
>+#endif
> #include <stdlib.h>
> #include <string.h>
> #include <errno.h>
>@@ -86,7 +90,7 @@ static guint64 get_start_time_for_pid (gint    pid,
> static gint _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
>                                             GError            **error);
> 
>-#ifdef HAVE_FREEBSD
>+#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD)
> static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p);
> #endif
> 
>@@ -554,12 +558,38 @@ get_kinfo_proc (pid_t pid, struct kinfo_proc *p)
> }
> #endif
> 
>+#ifdef HAVE_OPENBSD
>+static gboolean
>+get_kinfo_proc (gint pid, struct kinfo_proc *p)
>+{
>+	int name[6];
>+	u_int namelen;
>+	size_t sz;
>+
>+	sz = sizeof(*p);
>+	namelen = 0;
>+	name[namelen++] = CTL_KERN;
>+	name[namelen++] = KERN_PROC;
>+	name[namelen++] = KERN_PROC_PID;
>+	name[namelen++] = pid;
>+	name[namelen++] = sz;
>+	name[namelen++] = 1;
>+
>+	if (sysctl (name, namelen, p, &sz, NULL, 0) == -1) {
>+		perror("sysctl kern.proc.pid");
>+		return FALSE;
>+	}
>+
>+	return TRUE;
>+}
>+#endif
>+
> static guint64
> get_start_time_for_pid (pid_t    pid,
>                         GError **error)
> {
>   guint64 start_time;
>-#ifndef HAVE_FREEBSD
>+#if !defined(HAVE_FREEBSD) && !defined(HAVE_OPENBSD)
>   gchar *filename;
>   gchar *contents;
>   size_t length;
>@@ -647,7 +677,11 @@ get_start_time_for_pid (pid_t    pid,
>       goto out;
>     }
> 
>+#ifdef HAVE_FREEBSD
>   start_time = (guint64) p.ki_start.tv_sec;
>+#else
>+  start_time = (guint64) p.p_ustart_sec;
>+#endif
> 
> out:
> #endif
>@@ -662,7 +696,7 @@ _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
>   gint result;
>   gchar *contents;
>   gchar **lines;
>-#ifdef HAVE_FREEBSD
>+#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD)
>   struct kinfo_proc p;
> #else
>   gchar filename[64];
>@@ -676,7 +710,7 @@ _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
>   lines = NULL;
>   contents = NULL;
> 
>-#ifdef HAVE_FREEBSD
>+#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD)
>   if (get_kinfo_proc (process->pid, &p) == 0)
>     {
>       g_set_error (error,
>@@ -688,8 +722,12 @@ _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
>       goto out;
>     }
> 
>+#if defined(HAVE_FREEBSD)
>   result = p.ki_uid;
> #else
>+  result = p.p_uid;
>+#endif
>+#else
> 
>   /* see 'man proc' for layout of the status file
>    *
>-- 
>1.8.5.3
>

Actions: View | Splinter Review

Attachments on bug 75187: 94329 | 94330 | 94331 | 94333 | 117176 | 117239

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.