# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1117211878 0
# Node ID 3924393e2456a0cd7f8ee3c39a1977c352f8a8ef
# Parent  675f7bf3c3918effb426a9ba83a1d1b033a0cc5c# Parent  65585699d980f3debe2b865d2c17576a68c6c965
merge of 7d53fee744460df7d2297614c9a4a8a6722eb277
     and cc783df3845d0779e2407f0a83fbb605c12efa7d

diff -r 65585699d980 -r 3924393e2456 svr-chansession.c
--- a/svr-chansession.c	Tue May 10 17:02:05 2005 +0000
+++ b/svr-chansession.c	Fri May 27 16:37:58 2005 +0000
@@ -862,8 +862,10 @@
 
 		if ((setgid(ses.authstate.pw->pw_gid) < 0) ||
 			(initgroups(ses.authstate.pw->pw_name, 
-						ses.authstate.pw->pw_gid) < 0) ||
-			(setuid(ses.authstate.pw->pw_uid) < 0)) {
+						ses.authstate.pw->pw_gid) < 0)) {
+			dropbear_exit("error changing user group");
+		}
+		if (setuid(ses.authstate.pw->pw_uid) < 0) {
 			dropbear_exit("error changing user");
 		}
 	} else {