stop build when an error occurs and when BUILDLOG is set (#5160)

[openwrt.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 ac617e2..eb1db52 100644 (file)
--- a/package/dropbear/patches/110-change_user.patch
+++ b/package/dropbear/patches/110-change_user.patch
@@ -1,19 +1,20 @@
-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
-@@ -860,12 +860,12 @@
+Index: dropbear-0.52/svr-chansession.c
+===================================================================
+--- dropbear-0.52.orig/svr-chansession.c       2008-04-22 17:29:49.000000000 -0700
++++ dropbear-0.52/svr-chansession.c    2008-04-22 17:29:49.000000000 -0700
+@@ -852,12 +852,12 @@
        /* 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))) {
+-              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)) {
+-              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 {