From: Roy Marples Date: Wed, 15 Jul 2026 13:47:08 +0000 (+0100) Subject: compat: add getpeereid.c and move compat out of control.c X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77331decbef31b4147da667965d429132569a64f;p=thirdparty%2Fdhcpcd.git compat: add getpeereid.c and move compat out of control.c --- diff --git a/compat/getpeereid.c b/compat/getpeereid.c new file mode 100644 index 00000000..8f38b7b2 --- /dev/null +++ b/compat/getpeereid.c @@ -0,0 +1,66 @@ +/* + * compat: getpeereid + * SPDX-License-Identifier: BSD-2-Clause + * Copyright (c) 2006-2026 Roy Marples + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 +#include + +#ifdef __sun +#include +#endif + +int +getpeereid(int fd, uid_t *uid, gid_t *gid) +{ +#if defined(SO_PEERCRED) +#if defined(__OpenBSD__) + struct sockpeercred creds; +#else + struct ucred creds; +#endif + socklen_t creds_len = sizeof(creds); + + if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &creds_len) == -1) + return -1; + + *uid = creds.uid; + *gid = creds.gid; +#elif defined(__sun) + ucred_t *ucred = NULL; + + if (getpeerucred(fd, &ucred) == -1) + return -1; + + *uid = ucred_geteuid(ucred); + *gid = ucred_getegid(ucred); + ucred_free(ucred); +#else +#error OS has no getpeereid support! +#endif + + return 0; +} diff --git a/compat/getpeereid.h b/compat/getpeereid.h new file mode 100644 index 00000000..c8949dc6 --- /dev/null +++ b/compat/getpeereid.h @@ -0,0 +1,36 @@ +/* + * compat: getpeereid + * SPDX-License-Identifier: BSD-2-Clause + * Copyright (c) 2006-2026 Roy Marples + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + */ + +#ifndef GETPEEREID_H +#define GETPEEREID_H + +#include + +int getpeereid(int, uid_t *, gid_t *); + +#endif diff --git a/configure b/configure index b246fd3e..3c56eda7 100755 --- a/configure +++ b/configure @@ -938,6 +938,28 @@ if [ "$ARC4RANDOM_UNIFORM" = no ]; then echo "#include \"compat/arc4random_uniform.h\"" >>$CONFIG_H fi +if [ -z "$GETPEEREID" ]; then + printf "Testing for getpeereid ... " + cat <_getpeereid.c +#include +#include +int main(void) { + return getpeereid(0, NULL, NULL); +} +EOF + if $XCC _getpeereid.c -o _getpeereid 2>&3; then + GETPEEREID=yes + else + GETPEEREID=no + fi + echo "$GETPEEREID" + rm -rf _getpeereid.* _getpeereid +fi +if [ "$GETPEEREID" = no ]; then + echo "COMPAT_SRCS+= compat/getpeereid.c" >>$CONFIG_MK + echo "#include \"compat/getpeereid.h\"" >>$CONFIG_H +fi + if [ -z "$MEMSET_EXPLICIT" ]; then printf "Testing for memset_explicit ... " cat <_memset_explicit.c diff --git a/src/control.c b/src/control.c index 547b4bef..d4ff3a71 100644 --- a/src/control.c +++ b/src/control.c @@ -41,10 +41,6 @@ #include #include -#if defined(__sun) -#include -#endif - #include "common.h" #include "config.h" #include "control.h" @@ -103,36 +99,6 @@ control_hangup(struct fd_list *fd) control_free(fd); } -#ifdef SO_PEERCRED -static int -getpeereid(int fd, uid_t *uid, gid_t *gid) -{ - struct ucred creds; - socklen_t creds_len = sizeof(creds); - - if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &creds_len) == -1) - return -1; - - *uid = creds.uid; - *gid = creds.gid; - return 0; -} -#elif defined(__sun) -static int -getpeereid(int fd, uid_t *uid, gid_t *gid) -{ - ucred_t *ucred = NULL; - - if (getpeerucred(fd, &ucred) == -1) - return -1; - - *uid = ucred_geteuid(ucred); - *gid = ucred_getegid(ucred); - ucred_free(ucred); - return 0; -} -#endif - static ssize_t control_handle_read(struct fd_list *fd) {