From 400b8786d6d184675152a2f04d3fe806f7c954ae Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 6 Jun 2003 10:46:04 +1000 Subject: - (dtucker) [uidswap.c] Fix setreuid and add missing args to fatal(). ok djm@ --- uidswap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'uidswap.c') diff --git a/uidswap.c b/uidswap.c index 04c269b0..e517da21 100644 --- a/uidswap.c +++ b/uidswap.c @@ -167,9 +167,9 @@ permanently_set_uid(struct passwd *pw) #if defined(HAVE_SETRESUID) if (setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) < 0) fatal("setresuid %u: %.100s", (u_int)pw->pw_uid, strerror(errno)); -#elif defined(HAVE_SETRESUID) - if (setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) < 0) - fatal("setresuid %u: %.100s", (u_int)pw->pw_uid, strerror(errno)); +#elif defined(HAVE_SETREUID) + if (setreuid(pw->pw_uid, pw->pw_uid) < 0) + fatal("setreuid %u: %.100s", (u_int)pw->pw_uid, strerror(errno)); #else # ifndef SETEUID_BREAKS_SETUID if (seteuid(pw->pw_uid) < 0) @@ -182,7 +182,7 @@ permanently_set_uid(struct passwd *pw) /* Try restoration of GID if changed (test clearing of saved gid) */ if (old_gid != pw->pw_gid && (setgid(old_gid) != -1 || setegid(old_gid) != -1)) - fatal("%s: was able to restore old [e]gid"); + fatal("%s: was able to restore old [e]gid", __func__); /* Verify GID drop was successful */ if (getgid() != pw->pw_gid || getegid() != pw->pw_gid) { @@ -194,7 +194,7 @@ permanently_set_uid(struct passwd *pw) /* Try restoration of UID if changed (test clearing of saved uid) */ if (old_uid != pw->pw_uid && (setuid(old_uid) != -1 || seteuid(old_uid) != -1)) - fatal("%s: was able to restore old [e]uid"); + fatal("%s: was able to restore old [e]uid", __func__); /* Verify UID drop was successful */ if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) { -- cgit v1.2.1