Re-import of OpenSSH 3.7.1p2 (Chase\!)

[gssapi-openssh.git] / openssh / uidswap.c

diff --git a/openssh/uidswap.c b/openssh/uidswap.c
index 4cabaa444d3a5bf2e67d11f85f1a30ecc2920b24..9e161d0f08056c57e42d6e20bf805a3b9e21edb2 100644 (file)
--- a/openssh/uidswap.c
+++ b/openssh/uidswap.c
@@ -151,7 +151,7 @@ permanently_set_uid(struct passwd *pw)
        debug("permanently_set_uid: %u/%u", (u_int)pw->pw_uid,
            (u_int)pw->pw_gid);
 
-#if defined(HAVE_SETRESGID) && !defined(BROKEN_SETRESGID)
+#if defined(HAVE_SETRESGID)
        if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) < 0)
                fatal("setresgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno));
 #elif defined(HAVE_SETREGID) && !defined(BROKEN_SETREGID)
@@ -164,7 +164,7 @@ permanently_set_uid(struct passwd *pw)
                fatal("setgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno));
 #endif
 
-#if defined(HAVE_SETRESUID) && !defined(BROKEN_SETRESUID)
+#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_SETREUID) && !defined(BROKEN_SETREUID)
@@ -180,28 +180,28 @@ permanently_set_uid(struct passwd *pw)
 #endif
 
        /* Try restoration of GID if changed (test clearing of saved gid) */
-       if (old_gid != pw->pw_gid &&
+       if (old_gid != pw->pw_gid && 
            (setgid(old_gid) != -1 || setegid(old_gid) != -1))
                fatal("%s: was able to restore old [e]gid", __func__);
 
        /* Verify GID drop was successful */
        if (getgid() != pw->pw_gid || getegid() != pw->pw_gid) {
-               fatal("%s: egid incorrect gid:%u egid:%u (should be %u)",
-                   __func__, (u_int)getgid(), (u_int)getegid(),
+               fatal("%s: egid incorrect gid:%u egid:%u (should be %u)", 
+                   __func__, (u_int)getgid(), (u_int)getegid(), 
                    (u_int)pw->pw_gid);
        }
 
 #ifndef HAVE_CYGWIN
        /* Try restoration of UID if changed (test clearing of saved uid) */
-       if (old_uid != pw->pw_uid &&
+       if (old_uid != pw->pw_uid && 
            (setuid(old_uid) != -1 || seteuid(old_uid) != -1))
                fatal("%s: was able to restore old [e]uid", __func__);
 #endif
 
        /* Verify UID drop was successful */
        if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid) {
-               fatal("%s: euid incorrect uid:%u euid:%u (should be %u)",
-                   __func__, (u_int)getuid(), (u_int)geteuid(),
+               fatal("%s: euid incorrect uid:%u euid:%u (should be %u)", 
+                   __func__, (u_int)getuid(), (u_int)geteuid(), 
                    (u_int)pw->pw_uid);
        }
 }