diff options
| author | Roy Marples <roy@marples.name> | 2008-02-13 23:44:17 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-02-13 23:44:17 +0000 |
| commit | 9854f9e3ee5c1ef8d61171b6a1a38dacc6f67720 (patch) | |
| tree | 4f84885410a0663d240697fb6a92de6487a80ff1 | |
| parent | 096ac08fe356169f82c43fbf1d02aae4c8e2a360 (diff) | |
| download | openrc-9854f9e3ee5c1ef8d61171b6a1a38dacc6f67720.tar.gz openrc-9854f9e3ee5c1ef8d61171b6a1a38dacc6f67720.tar.bz2 openrc-9854f9e3ee5c1ef8d61171b6a1a38dacc6f67720.tar.xz | |
Use _PATH_DEVNULL on FreeBSD when using kvm_openfiles so we work in a jail, bug #21.
| -rw-r--r-- | src/librc/librc-daemon.c | 14 | ||||
| -rw-r--r-- | src/librc/librc.h | 1 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c index e345f5f..7ea66fa 100644 --- a/src/librc/librc-daemon.c +++ b/src/librc/librc-daemon.c @@ -182,6 +182,7 @@ librc_hidden_def(rc_find_pids) # define _GET_KINFO_UID(kp) (kp.ki_ruid) # define _GET_KINFO_COMM(kp) (kp.ki_comm) # define _GET_KINFO_PID(kp) (kp.ki_pid) +# define _KVM_PATH _PATH_DEVNULL # else # define _KVM_GETPROC2 # define _KINFO_PROC kinfo_proc2 @@ -189,6 +190,7 @@ librc_hidden_def(rc_find_pids) # define _GET_KINFO_UID(kp) (kp.p_ruid) # define _GET_KINFO_COMM(kp) (kp.p_comm) # define _GET_KINFO_PID(kp) (kp.p_pid) +# define _KVM_PATH NULL # endif pid_t *rc_find_pids (const char *exec, const char *cmd, @@ -205,8 +207,10 @@ pid_t *rc_find_pids (const char *exec, const char *cmd, pid_t *tmp; int npids = 0; - if ((kd = kvm_openfiles (NULL, NULL, NULL, O_RDONLY, errbuf)) == NULL) { - fprintf (stderr, "kvm_open: %s", errbuf); + if ((kd = kvm_openfiles (_KVM_PATH, _KVM_PATH, + NULL, O_RDONLY, errbuf)) == NULL) + { + fprintf (stderr, "kvm_open: %s\n", errbuf); return (NULL); } @@ -215,6 +219,12 @@ pid_t *rc_find_pids (const char *exec, const char *cmd, #else kp = kvm_getprocs (kd, KERN_PROC_PROC, 0, &processes); #endif + if ((kp == NULL && processes > 0) || (kp != NULL && processes < 0)) { + fprintf (stderr, "kvm_getprocs: %s\n", kvm_geterr (kd)); + kvm_close (kd); + return (NULL); + } + for (i = 0; i < processes; i++) { pid_t p = _GET_KINFO_PID (kp[i]); if (pid != 0 && pid != p) diff --git a/src/librc/librc.h b/src/librc/librc.h index 0f6212f..7a5d9a0 100644 --- a/src/librc/librc.h +++ b/src/librc/librc.h @@ -45,6 +45,7 @@ #include <fcntl.h> #include <libgen.h> #include <limits.h> +#include <paths.h> #include <regex.h> #include <stdarg.h> #include <stdbool.h> |