From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Tue, 6 Mar 2018 19:05:07 +0000 (-0700)
Subject: Use correct defines when checking for sysctl kinfo_proc support.
X-Git-Tag: SUDO_1_8_23^2~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f984de1ba991dcafafd7926f894fdb7cd8d1f062;p=sudo

Use correct defines when checking for sysctl kinfo_proc support.
---

diff --git a/plugins/sudoers/starttime.c b/plugins/sudoers/starttime.c
index 4c0f2ec46..277548c89 100644
--- a/plugins/sudoers/starttime.c
+++ b/plugins/sudoers/starttime.c
@@ -24,9 +24,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#if defined(HAVE_44BSD_KINFO_PROC) || defined (HAVE_OPENBSD_KINFO_PROC) || defined(HAVE_NETBSD_KINFO_PROC2)
+#if defined(HAVE_KINFO_PROC_44BSD) || defined (HAVE_KINFO_PROC_OPENBSD) || defined(HAVE_KINFO_PROC2_NETBSD2)
 # include <sys/sysctl.h>
-#elif defined(HAVE_FREEBSD_KINFO_PROC)
+#elif defined(HAVE_KINFO_PROC_FREEBSD)
 # include <sys/sysctl.h>
 # include <sys/user.h>
 #endif
@@ -59,15 +59,15 @@
 /*
  * Arguments for sysctl(2) when reading the process start time.
  */
-#if defined(HAVE_NETBSD_KINFO_PROC)
+#if defined(HAVE_KINFO_PROC2_NETBSD)
 # define SUDO_KERN_PROC		KERN_PROC2
 # define sudo_kinfo_proc	kinfo_proc2
 # define sudo_kp_namelen	6
-#elif defined(HAVE_OPENBSD_KINFO_PROC)
+#elif defined(HAVE_KINFO_PROC_OPENBSD)
 # define SUDO_KERN_PROC		KERN_PROC
 # define sudo_kinfo_proc	kinfo_proc
 # define sudo_kp_namelen	6
-#elif defined(HAVE_FREEBSD_KINFO_PROC) || defined(HAVE_44BSD_KINFO_PROC)
+#elif defined(HAVE_KINFO_PROC_FREEBSD) || defined(HAVE_KINFO_PROC_44BSD)
 # define SUDO_KERN_PROC		KERN_PROC
 # define sudo_kinfo_proc	kinfo_proc
 # define sudo_kp_namelen	4
@@ -107,11 +107,11 @@ get_starttime(pid_t pid, struct timespec *starttime)
 	rc = sysctl(mib, sudo_kp_namelen, ki_proc, &size, NULL, 0);
     } while (rc == -1 && errno == ENOMEM);
     if (rc != -1) {
-#if defined(HAVE_FREEBSD_KINFO_PROC)
+#if defined(HAVE_KINFO_PROC_FREEBSD)
 	/* FreeBSD and Dragonfly */
 	starttime->tv_sec = ki_proc->ki_start.tv_sec;
 	starttime->tv_nsec = ki_proc->ki_start.tv_usec / 1000;
-#elif defined(HAVE_44BSD_KINFO_PROC)
+#elif defined(HAVE_KINFO_PROC_44BSD)
 	/* 4.4BSD and macOS */
 	starttime->tv_sec = ki_proc->kp_proc.p_starttime.tv_sec;
 	starttime->tv_nsec = ki_proc->kp_proc.p_starttime.tv_usec / 1000;