Browse Source

s-s-d: Use correct struct kinfo_proc ruid submember on NetBSD

Guillem Jover 7 years ago
parent
commit
12af640e1b
2 changed files with 4 additions and 0 deletions
  1. 2 0
      debian/changelog
  2. 2 0
      utils/start-stop-daemon.c

+ 2 - 0
debian/changelog

@@ -9,6 +9,8 @@ dpkg (1.18.23) UNRELEASED; urgency=medium
     - Rename err variable to ret in start-stop-daemon as the former is a
       function on BSDs.
     - Use 5-argument kvm_getprocs() call form on OpenBSD in start-stop-daemon.
+    - Use correct struct kinfo_proc ruid submember name on NetBSD in
+      start-stop-daemon.
   * Perl modules:
     - Do not special case EM_SPARC32PLUS for NetBSD in Dpkg::Shlibs::Objdump,
       the code has been fixed in NetBSD as that situation could not happen.

+ 2 - 0
utils/start-stop-daemon.c

@@ -1765,6 +1765,8 @@ pid_is_user(pid_t pid, uid_t uid)
 	proc_uid = kp->p_ruid;
 #elif defined(OS_DragonFlyBSD)
 	proc_uid = kp->kp_ruid;
+#elif defined(OS_NetBSD)
+	proc_uid = kp->kp_eproc.e_pcred.p_ruid;
 #else
 	if (kp->kp_proc.p_cred)
 		kvm_read(kd, (u_long)&(kp->kp_proc.p_cred->p_ruid),