From eb431e0bd1b221804e83f38f6371c256428e43da Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 25 Aug 2000 06:42:49 +0000
Subject: Merge with Linux 2.4.0-test6.

---
 kernel/sys.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'kernel')

diff --git a/kernel/sys.c b/kernel/sys.c
index 0f3181f70..8a4453104 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -570,12 +570,7 @@ asmlinkage long sys_setuid(uid_t uid)
 		if (uid != old_ruid && set_user(uid) < 0)
 			return -EAGAIN;
 		current->suid = uid;
-	} else if (uid == current->uid) {
-		/* Nothing - just set fsuid/euid */
-	}  else if (uid == current->suid) {
-		if (set_user(uid) < 0)
-			return -EAGAIN;
-	} else
+	} else if ((uid != current->uid) && (uid != current->suid))
 		return -EPERM;
 
 	current->fsuid = current->euid = uid;
-- 
cgit v1.2.3