[backfire] sync dropbear with trunk (#9819)

[openwrt-10.03/.git] / package / dropbear / patches / 110-change_user.patch

diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch
index 20bb41c2d2ae3fcc49d1f94dcda6811d11273a6d..f003c276cf6904bafe76e28a15abe0c1c1df499c 100644 (file)
--- a/package/dropbear/patches/110-change_user.patch
+++ b/package/dropbear/patches/110-change_user.patch
@@ -1,20 +1,18 @@
-Index: dropbear-0.50/svr-chansession.c
-===================================================================
---- dropbear-0.50.orig/svr-chansession.c       2007-08-10 23:47:48.000000000 +0200
-+++ dropbear-0.50/svr-chansession.c    2007-08-10 23:47:48.000000000 +0200
-@@ -908,12 +908,12 @@
+--- a/svr-chansession.c
++++ b/svr-chansession.c
+@@ -881,12 +881,12 @@ static void execchild(void *user_data) {
        /* We can only change uid/gid as root ... */
        if (getuid() == 0) {
  
--              if ((setgid(ses.authstate.pw->pw_gid) < 0) ||
-+              if ((ses.authstate.pw->pw_gid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) ||
-                       (initgroups(ses.authstate.pw->pw_name, 
--                                              ses.authstate.pw->pw_gid) < 0)) {
-+                                              ses.authstate.pw->pw_gid) < 0))) {
-                       dropbear_exit("error changing user group");
+-              if ((setgid(ses.authstate.pw_gid) < 0) ||
++              if ((ses.authstate.pw_gid != 0) && ((setgid(ses.authstate.pw_gid) < 0) ||
+                       (initgroups(ses.authstate.pw_name, 
+-                                              ses.authstate.pw_gid) < 0)) {
++                                              ses.authstate.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)) {
-                       dropbear_exit("error changing user");
+-              if (setuid(ses.authstate.pw_uid) < 0) {
++              if ((ses.authstate.pw_uid != 0) && (setuid(ses.authstate.pw_uid) < 0)) {
+                       dropbear_exit("Error changing user");
                }
        } else {