Ticket #39018: patch-utils_start-stop-daemon.c.diff

utils/start-stop-daemon.c

@@ -39 +39 @@
 #  define OSFreeBSD
 #elif defined(__NetBSD__)
 #  define OSNetBSD
+#elif defined(__APPLE__)
+#  define OSDarwin
 #else
 #  error Unknown architecture - cannot build start-stop-daemon
 #endif
@@ -54 +56 @@
 #include <ps.h>
 #endif
 
-#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
+#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
+#include <sys/time.h>
 #include <sys/param.h>
 #include <sys/proc.h>
 
@@ -1810 +1813 @@
         execv(startas, argv);
         fatal("unable to start %s", startas);
 }
+
+
+#if defined(OSDarwin)
+#include <sys/sysctl.h>
+int
+pid_is_user(pid_t pid, uid_t uid)
+{
+        int mib[4];
+        size_t size;
+        struct kinfo_proc ki;
+    
+        size = sizeof(ki);
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_PID;
+        mib[3] = pid;
+        if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
+                errx(1, "%s", "Failure calling sysctl");
+        return (uid == ki.kp_eproc.e_pcred.p_ruid);
+}
+
+static int
+pid_is_cmd(pid_t pid, const char *name)
+{
+        int mib[4];
+        size_t size;
+        struct kinfo_proc ki;
+    
+        size = sizeof(ki);
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_PID;
+        mib[3] = pid;
+        if (sysctl(mib, 4, &ki, &size, NULL, 0) < 0)
+                errx(1, "%s", "Failure calling sysctl");
+        return (!strncmp(name, ki.kp_proc.p_comm, MAXCOMLEN));
+}
+
+static void
+do_procinit(void)
+{
+        int mib[3];
+        size_t size;
+        int nprocs, ret, i;
+        struct kinfo_proc *procs = NULL, *newprocs;
+        
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_ALL;
+        ret = sysctl(mib, 3, NULL, &size, NULL, 0);
+        /* Allocate enough memory for entire process table */
+        do {
+                size += size / 10;
+                newprocs = realloc(procs, size);
+                if (newprocs == NULL) {
+                        if (procs)
+                                free(procs);
+                        errx(1, "%s", "Could not reallocate memory");
+                }
+                procs = newprocs;
+                ret = sysctl(mib, 3, procs, &size, NULL, 0);
+        } while (ret >= 0 && errno == ENOMEM);
+    
+        if (ret < 0)
+                errx(1, "%s", "Failure calling sysctl");
+    
+        /* Verify size of proc structure */
+        if (size % sizeof(struct kinfo_proc) != 0)
+                errx(1, "%s", "proc size mismatch, userland out of sync with kernel");
+        nprocs = size / sizeof(struct kinfo_proc);
+        for (i = 0; i < nprocs; i++) {
+                check(procs[i].kp_proc.p_pid);
+        }
+}
+#endif /* OSDarwin */