libopenbsd: remove MacOSX compat functions, its not supported anyways

diff --git a/configure b/configure
index 4dfd287ade349527c511d53434813253b501cbb9..95df243baba743e2d14269b9bae11c2a6b6f8685 100755 (executable)
--- a/configure
+++ b/configure
@@ -326,9 +326,7 @@ int main(void) {
        execvpe("", p, p);
        return 0;
 }'
        execvpe("", p, p);
        return 0;
 }'

-check_func "execvpe" "$src" || {
-       printf 'OPENBSD  +=     execvpe.o\n' >>$CONFIG_MK
-}
+check_func "execvpe" "$src" || die "system has no execvpe(3): not supported"

 
 #
 # Check for setresuid().
 
 #
 # Check for setresuid().


@@ -339,9 +337,7 @@ int main(void) {
        setresuid(0, 0, 0);
        return 0;
 }'
        setresuid(0, 0, 0);
        return 0;
 }'

-check_func "setresuid" "$src" || {
-       printf 'OPENBSD  +=     setresuid.o\n' >>$CONFIG_MK
-}
+check_func "setresuid" "$src" || die "system has no setresuid(2): not supported"

 
 #
 # Check for closefrom().
 
 #
 # Check for closefrom().

diff --git a/libopenbsd/execvpe.c b/libopenbsd/execvpe.c
deleted file mode 100644 (file)
index c3238ea..0000000
--- a/libopenbsd/execvpe.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*     $OpenBSD: exec.c,v 1.23 2016/03/13 18:34:20 guenther Exp $ */
-/*-
- * Copyright (c) 1991, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "includes.h"
-
-#include <sys/types.h>
-#include <sys/uio.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-int
-execvpe(const char *name, char *const *argv, char *const *envp)
-{
-       char **memp;
-       int cnt;
-       size_t lp, ln, len;
-       char *p;
-       int eacces = 0;
-       char *bp, *cur, *path, buf[PATH_MAX];
-
-       /*
-        * Do not allow null name
-        */
-       if (name == NULL || *name == '\0') {
-               errno = ENOENT;
-               return (-1);
-       }
-
-       /* If it's an absolute or relative path name, it's easy. */
-       if (strchr(name, '/')) {
-               bp = (char *)name;
-               cur = path = NULL;
-               goto retry;
-       }
-       bp = buf;
-
-       /* Get the path we're searching. */
-       if (!(path = getenv("PATH")))
-               path = _PATH_DEFPATH;
-       len = strlen(path) + 1;
-       cur = alloca(len);
-       if (cur == NULL) {
-               errno = ENOMEM;
-               return (-1);
-       }
-       strlcpy(cur, path, len);
-       path = cur;
-       while ((p = strsep(&cur, ":"))) {
-               /*
-                * It's a SHELL path -- double, leading and trailing colons
-                * mean the current directory.
-                */
-               if (!*p) {
-                       p = ".";
-                       lp = 1;
-               } else
-                       lp = strlen(p);
-               ln = strlen(name);
-
-               /*
-                * If the path is too long complain.  This is a possible
-                * security issue; given a way to make the path too long
-                * the user may execute the wrong program.
-                */
-               if (lp + ln + 2 > sizeof(buf)) {
-                       struct iovec iov[3];
-
-                       iov[0].iov_base = "execvp: ";
-                       iov[0].iov_len = 8;
-                       iov[1].iov_base = p;
-                       iov[1].iov_len = lp;
-                       iov[2].iov_base = ": path too long\n";
-                       iov[2].iov_len = 16;
-                       (void)writev(STDERR_FILENO, iov, 3);
-                       continue;
-               }
-               bcopy(p, buf, lp);
-               buf[lp] = '/';
-               bcopy(name, buf + lp + 1, ln);
-               buf[lp + ln + 1] = '\0';
-
-retry:         (void)execve(bp, argv, envp);
-               switch(errno) {
-               case E2BIG:
-                       goto done;
-               case EISDIR:
-               case ELOOP:
-               case ENAMETOOLONG:
-               case ENOENT:
-                       break;
-               case ENOEXEC:
-                       for (cnt = 0; argv[cnt]; ++cnt)
-                               ;
-                       memp = alloca((cnt + 2) * sizeof(char *));
-                       if (memp == NULL)
-                               goto done;
-                       memp[0] = "sh";
-                       memp[1] = bp;
-                       bcopy(argv + 1, memp + 2, cnt * sizeof(char *));
-                       (void)execve(_PATH_BSHELL, memp, envp);
-                       goto done;
-               case ENOMEM:
-                       goto done;
-               case ENOTDIR:
-                       break;
-               case ETXTBSY:
-                       /*
-                        * We used to retry here, but sh(1) doesn't.
-                        */
-                       goto done;
-               case EACCES:
-                       eacces = 1;
-                       break;
-               default:
-                       goto done;
-               }
-       }
-       if (eacces)
-               errno = EACCES;
-       else if (!errno)
-               errno = ENOENT;
-done:
-       return (-1);
-}

diff --git a/libopenbsd/setresuid.c b/libopenbsd/setresuid.c
deleted file mode 100644 (file)
index a62b19a..0000000
--- a/libopenbsd/setresuid.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015 Nathan Holstein <nathan.holstein@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <unistd.h>
-
-/* I don't think we can actually mimic the right semantics? */
-int
-setresuid(uid_t ruid, uid_t euid, uid_t suid)
-{
-       int ret;
-       if (suid != ruid) {
-               errno = EPERM;
-               return -1;
-       }
-       if ((ret = setuid(ruid)) != 0)
-               return ret;
-       if ((ret = seteuid(euid)) != 0)
-               return ret;
-       return 0;
-}
-