[package] dropbear: fix 100-pubkey_path.patch which broke pubkey auth after updating...
[openwrt-10.03/.git] / package / dropbear / patches / 110-change_user.patch
1 Index: dropbear-0.52/svr-chansession.c
2 ===================================================================
3 --- dropbear-0.52.orig/svr-chansession.c        2008-04-22 17:29:49.000000000 -0700
4 +++ dropbear-0.52/svr-chansession.c     2008-04-22 17:29:49.000000000 -0700
5 @@ -852,12 +852,12 @@
6         /* We can only change uid/gid as root ... */
7         if (getuid() == 0) {
8  
9 -               if ((setgid(ses.authstate.pw_gid) < 0) ||
10 +               if ((ses.authstate.pw_gid != 0) && ((setgid(ses.authstate.pw_gid) < 0) ||
11                         (initgroups(ses.authstate.pw_name, 
12 -                                               ses.authstate.pw_gid) < 0)) {
13 +                                               ses.authstate.pw_gid) < 0))) {
14                         dropbear_exit("error changing user group");
15                 }
16 -               if (setuid(ses.authstate.pw_uid) < 0) {
17 +               if ((ses.authstate.pw_uid != 0) && (setuid(ses.authstate.pw_uid) < 0)) {
18                         dropbear_exit("error changing user");
19                 }
20         } else {