From: Mark Andrews <marka@isc.org>
Date: Fri, 4 Nov 2022 06:21:31 +0000 (+0000)
Subject: Fix local getresuid and getresuid implementations
X-Git-Tag: v9.19.7~5^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=93e8d063857f87acf897a4ab22e2aeb76860af96;p=thirdparty%2Fbind9.git

Fix local getresuid and getresuid implementations
---

diff --git a/bin/named/os.c b/bin/named/os.c
index 56792190d6a..3506a5e605c 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 */