2005-12-13 19:15:43 +00:00
|
|
|
diff -urN dropbear.old/svr-chansession.c dropbear.dev/svr-chansession.c
|
|
|
|
|
--- dropbear.old/svr-chansession.c 2005-12-09 06:42:33.000000000 +0100
|
|
|
|
|
+++ dropbear.dev/svr-chansession.c 2005-12-12 01:42:38.982034750 +0100
|
2005-10-20 13:55:42 +00:00
|
|
|
@@ -860,12 +860,12 @@
|
2005-03-06 03:53:29 +00:00
|
|
|
/* We can only change uid/gid as root ... */
|
|
|
|
|
if (getuid() == 0) {
|
|
|
|
|
|
|
|
|
|
- if ((setgid(ses.authstate.pw->pw_gid) < 0) ||
|
2005-10-20 13:55:42 +00:00
|
|
|
+ if ((ses.authstate.pw->pw_gid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) ||
|
2005-03-06 03:53:29 +00:00
|
|
|
(initgroups(ses.authstate.pw->pw_name,
|
2005-10-20 13:55:42 +00:00
|
|
|
- ses.authstate.pw->pw_gid) < 0)) {
|
|
|
|
|
+ ses.authstate.pw->pw_gid) < 0))) {
|
|
|
|
|
dropbear_exit("error changing user group");
|
|
|
|
|
}
|
|
|
|
|
- if (setuid(ses.authstate.pw->pw_uid) < 0) {
|
|
|
|
|
+ if ((ses.authstate.pw->pw_uid != 0) && (setuid(ses.authstate.pw->pw_uid) < 0)) {
|
2005-03-06 03:53:29 +00:00
|
|
|
dropbear_exit("error changing user");
|
|
|
|
|
}
|
|
|
|
|
} else {
|
