===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/uidswap.c,v
retrieving revision 1.18
retrieving revision 1.18.2.4
diff -u -r1.18 -r1.18.2.4
--- src/usr.bin/ssh/uidswap.c	2001/08/08 21:34:19	1.18
+++ src/usr.bin/ssh/uidswap.c	2002/10/11 14:53:07	1.18.2.4
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: uidswap.c,v 1.18 2001/08/08 21:34:19 markus Exp $");
+RCSID("$OpenBSD: uidswap.c,v 1.18.2.4 2002/10/11 14:53:07 miod Exp $");
 
 #include "log.h"
 #include "uidswap.h"
@@ -46,16 +46,17 @@
 {
 	/* Save the current euid, and egroups. */
 	saved_euid = geteuid();
-	debug("temporarily_use_uid: %d/%d (e=%d)",
-	    pw->pw_uid, pw->pw_gid, saved_euid);
+	saved_egid = getegid();
+	debug("temporarily_use_uid: %u/%u (e=%u/%u)",
+	    (u_int)pw->pw_uid, (u_int)pw->pw_gid,
+	    (u_int)saved_euid, (u_int)saved_egid);
 	if (saved_euid != 0) {
 		privileged = 0;
 		return;
 	}
 	privileged = 1;
 	temporarily_use_uid_effective = 1;
-	saved_egid = getegid();                                                       
-	saved_egroupslen = getgroups(NGROUPS_MAX, saved_egroups);                           
+	saved_egroupslen = getgroups(NGROUPS_MAX, saved_egroups);
 	if (saved_egroupslen < 0)
 		fatal("getgroups: %.100s", strerror(errno));
 
@@ -64,19 +65,18 @@
 		if (initgroups(pw->pw_name, pw->pw_gid) < 0)
 			fatal("initgroups: %s: %.100s", pw->pw_name,
 			    strerror(errno));
-		user_groupslen = getgroups(NGROUPS_MAX, user_groups);                           
+		user_groupslen = getgroups(NGROUPS_MAX, user_groups);
 		if (user_groupslen < 0)
 			fatal("getgroups: %.100s", strerror(errno));
 	}
 	/* Set the effective uid to the given (unprivileged) uid. */
 	if (setgroups(user_groupslen, user_groups) < 0)
 		fatal("setgroups: %.100s", strerror(errno));
-	pw->pw_gid = pw->pw_gid;
 	if (setegid(pw->pw_gid) < 0)
-		fatal("setegid %u: %.100s", (u_int) pw->pw_gid,
+		fatal("setegid %u: %.100s", (u_int)pw->pw_gid,
 		    strerror(errno));
 	if (seteuid(pw->pw_uid) == -1)
-		fatal("seteuid %u: %.100s", (u_int) pw->pw_uid,
+		fatal("seteuid %u: %.100s", (u_int)pw->pw_uid,
 		    strerror(errno));
 }
 
@@ -86,19 +86,21 @@
 void
 restore_uid(void)
 {
-	debug("restore_uid");
 	/* it's a no-op unless privileged */
-	if (!privileged)
+	if (!privileged) {
+		debug("restore_uid: (unprivileged)");
 		return;
+	}
 	if (!temporarily_use_uid_effective)
 		fatal("restore_uid: temporarily_use_uid not effective");
+	debug("restore_uid: %u/%u", (u_int)saved_euid, (u_int)saved_egid);
 	/* Set the effective uid back to the saved privileged uid. */
 	if (seteuid(saved_euid) < 0)
-		fatal("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno));
+		fatal("seteuid %u: %.100s", (u_int)saved_euid, strerror(errno));
 	if (setgroups(saved_egroupslen, saved_egroups) < 0)
 		fatal("setgroups: %.100s", strerror(errno));
 	if (setegid(saved_egid) < 0)
-		fatal("setegid %u: %.100s", (u_int) saved_egid, strerror(errno));
+		fatal("setegid %u: %.100s", (u_int)saved_egid, strerror(errno));
 	temporarily_use_uid_effective = 0;
 }
 
@@ -110,9 +112,11 @@
 permanently_set_uid(struct passwd *pw)
 {
 	if (temporarily_use_uid_effective)
-		fatal("restore_uid: temporarily_use_uid effective");
+		fatal("permanently_set_uid: temporarily_use_uid effective");
+	debug("permanently_set_uid: %u/%u", (u_int)pw->pw_uid,
+	    (u_int)pw->pw_gid);
 	if (setgid(pw->pw_gid) < 0)
-		fatal("setgid %u: %.100s", (u_int) pw->pw_gid, strerror(errno));
+		fatal("setgid %u: %.100s", (u_int)pw->pw_gid, strerror(errno));
 	if (setuid(pw->pw_uid) < 0)
-		fatal("setuid %u: %.100s", (u_int) pw->pw_uid, strerror(errno));
+		fatal("setuid %u: %.100s", (u_int)pw->pw_uid, strerror(errno));
 }