mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Merge branch '3654-main-doesn-t-compile-on-macos' into 'main'

Browse Source 
Resolve "Main doesn't compile on MacOS"

Closes #3654

See merge request isc-projects/bind9!7031
This commit is contained in:
Mark Andrews
2022-11-04 10:36:40 +00:00
parent fdd146983e 93e8d06385
commit c5a79caa26
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/named/os.c
View File

@@ -269,8 +269,8 @@ getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid) {
#if !HAVE_SETRESGID #if !HAVE_SETRESGID
static int static int
setresgid(gid_t rgid, gid_t egid, gid_t sgid) { setresgid(gid_t rgid, gid_t egid, gid_t sgid) {
REQUIRE(rgid == -1); REQUIRE(rgid == (gid_t)-1);
REQUIRE(sgid == -1); REQUIRE(sgid == (gid_t)-1);
#if HAVE_SETREGID #if HAVE_SETREGID
return (setregid(rgid, egid)); return (setregid(rgid, egid));
@@ -283,9 +283,9 @@ setresgid(gid_t rgid, gid_t egid, gid_t sgid) {
#if !HAVE_GETRESUID #if !HAVE_GETRESUID
static int static int
getresuid(uid_t *ruid, uid_t *euid, uid_t *suid) { getresuid(uid_t *ruid, uid_t *euid, uid_t *suid) {
*rgid = -1; *ruid = -1;
*egid = geteuid(); *euid = geteuid();
*sgid = -1; *suid = -1;
return (0); return (0);
} }
@@ -294,13 +294,13 @@ getresuid(uid_t *ruid, uid_t *euid, uid_t *suid) {
#if !HAVE_SETRESUID #if !HAVE_SETRESUID
static int static int
setresuid(uid_t ruid, uid_t euid, uid_t suid) { setresuid(uid_t ruid, uid_t euid, uid_t suid) {
REQUIRE(rgid == -1); REQUIRE(ruid == (uid_t)-1);
REQUIRE(sgid == -1); REQUIRE(suid == (uid_t)-1);
#if HAVE_SETREGID #if HAVE_SETREGID
return (setregid(rgid, egid)); return (setregid(ruid, euid));
#else /* HAVE_SETREGID */ #else /* HAVE_SETREGID */
return (setegid(egid)); return (setegid(euid));
#endif /* HAVE_SETREGID */ #endif /* HAVE_SETREGID */
} }
#endif /* !HAVE_SETRESUID */ #endif /* !HAVE_SETRESUID */