From 93e8d063857f87acf897a4ab22e2aeb76860af96 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 4 Nov 2022 06:21:31 +0000 Subject: [PATCH] Fix local getresuid and getresuid implementations --- bin/named/os.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/named/os.c b/bin/named/os.c index 56792190d6..3506a5e605 100644 --- a/bin/named/os.c +++ b/bin/named/os.c @@ -269,8 +269,8 @@ getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid) { #if !HAVE_SETRESGID static int setresgid(gid_t rgid, gid_t egid, gid_t sgid) { - REQUIRE(rgid == -1); - REQUIRE(sgid == -1); + REQUIRE(rgid == (gid_t)-1); + REQUIRE(sgid == (gid_t)-1); #if HAVE_SETREGID return (setregid(rgid, egid)); @@ -283,9 +283,9 @@ setresgid(gid_t rgid, gid_t egid, gid_t sgid) { #if !HAVE_GETRESUID static int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid) { - *rgid = -1; - *egid = geteuid(); - *sgid = -1; + *ruid = -1; + *euid = geteuid(); + *suid = -1; return (0); } @@ -294,13 +294,13 @@ getresuid(uid_t *ruid, uid_t *euid, uid_t *suid) { #if !HAVE_SETRESUID static int setresuid(uid_t ruid, uid_t euid, uid_t suid) { - REQUIRE(rgid == -1); - REQUIRE(sgid == -1); + REQUIRE(ruid == (uid_t)-1); + REQUIRE(suid == (uid_t)-1); #if HAVE_SETREGID - return (setregid(rgid, egid)); + return (setregid(ruid, euid)); #else /* HAVE_SETREGID */ - return (setegid(egid)); + return (setegid(euid)); #endif /* HAVE_SETREGID */ } #endif /* !HAVE_SETRESUID */