diff options
Diffstat (limited to 'sysdeps/freebsd/procuid.c')
| -rw-r--r-- | sysdeps/freebsd/procuid.c | 66 |
1 files changed, 4 insertions, 62 deletions
diff --git a/sysdeps/freebsd/procuid.c b/sysdeps/freebsd/procuid.c index 133c6b97..c7f130c2 100644 --- a/sysdeps/freebsd/procuid.c +++ b/sysdeps/freebsd/procuid.c @@ -33,18 +33,14 @@ static const unsigned long _glibtop_sysdeps_proc_uid = (1L << GLIBTOP_PROC_UID_EGID) + (1L << GLIBTOP_PROC_UID_PID) + (1L << GLIBTOP_PROC_UID_PPID) + (1L << GLIBTOP_PROC_UID_PGRP) + (1L << GLIBTOP_PROC_UID_TPGID) + (1L << GLIBTOP_PROC_UID_PRIORITY) + -(1L << GLIBTOP_PROC_UID_NICE); - -static const unsigned long _glibtop_sysdeps_proc_uid_groups = -0L; +(1L << GLIBTOP_PROC_UID_NICE) + (1L << GLIBTOP_PROC_UID_GID); /* Init function. */ void glibtop_init_proc_uid_p (glibtop *server) { - server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid | - _glibtop_sysdeps_proc_uid_groups; + server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid; } /* Provides detailed information about a process. */ @@ -56,13 +52,6 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, struct kinfo_proc *pinfo; int count = 0; -#if LIBGTOP_VERSION_CODE >= 1001000 -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) - struct ucred ucred; - void *ucred_ptr; -#endif -#endif - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_UID), 0); memset (buf, 0, sizeof (glibtop_proc_uid)); @@ -77,10 +66,8 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, return; } -#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__) - #define PROC_RUID ki_ruid -#define PROC_SVUID ki_svuid +#define PROC_EUID ki_uid #define PROC_RGID ki_rgid #define PROC_SVGID ki_svgid #define PROC_PPID ki_ppid @@ -88,22 +75,9 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, #define PROC_TPGID ki_tpgid #define PROC_NICE ki_nice #define PROC_PRIORITY ki_pri.pri_user -#else - -#define PROC_RUID kp_eproc.e_pcred.p_ruid -#define PROC_SVUID kp_eproc.e_pcred.p_svuid -#define PROC_RGID kp_eproc.e_pcred.p_rgid -#define PROC_SVGID kp_eproc.e_pcred.p_svgid -#define PROC_PPID kp_eproc.e_ppid -#define PROC_PGID kp_eproc.e_pgid -#define PROC_TPGID kp_eproc.e_tpgid -#define PROC_NICE kp_proc.p_nice -#define PROC_PRIORITY kp_proc.p_priority - -#endif buf->uid = pinfo [0].PROC_RUID; - buf->euid = pinfo [0].PROC_SVUID; + buf->euid = pinfo [0].PROC_EUID; buf->gid = pinfo [0].PROC_RGID; buf->egid = pinfo [0].PROC_SVGID; @@ -112,39 +86,7 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf, buf->tpgid = pinfo [0].PROC_TPGID; buf->nice = pinfo [0].PROC_NICE; -#if defined(__NetBSD__) && defined(SACTIVE) - buf->priority = 0; -#else buf->priority = pinfo [0].PROC_PRIORITY; -#endif - /* Set the flags for the data we're about to return*/ buf->flags = _glibtop_sysdeps_proc_uid; - - /* Use LibGTop conditionals here so we can more easily merge this - * code into the LIBGTOP_STABLE_1_0 branch. */ -#if 0 - /* This probably also works with other versions, but not yet - * tested. Please remove the conditional if this is true. */ -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) - ucred_ptr = (void *) pinfo [0].kp_eproc.e_pcred.pc_ucred; - - if (ucred_ptr) { - if (kvm_read (server->machine.kd, (unsigned long) ucred_ptr, - &ucred, sizeof (ucred)) != sizeof (ucred)) { - glibtop_warn_io_r (server, "kvm_read (ucred)"); - } else { - int count = (ucred.cr_ngroups < GLIBTOP_MAX_GROUPS) ? - ucred.cr_ngroups : GLIBTOP_MAX_GROUPS; - int i; - - for (i = 0; i < count; i++) - buf->groups [i] = ucred.cr_groups [i]; - buf->ngroups = count; - - buf->flags |= _glibtop_sysdeps_proc_uid_groups; - } - } -#endif -#endif } |