[lantiq] Initial DSL framework

[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 eb1db52..55747bc 100644 (file)
--- a/package/dropbear/patches/110-change_user.patch
+++ b/package/dropbear/patches/110-change_user.patch
@@ -1,8 +1,6 @@
-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 @@
+--- a/svr-chansession.c
++++ b/svr-chansession.c
+@@ -884,12 +884,12 @@ static void execchild(void *user_data) {

        /* We can only change uid/gid as root ... */
        if (getuid() == 0) {
  
        /* We can only change uid/gid as root ... */
        if (getuid() == 0) {
  


@@ -11,10 +9,10 @@ Index: dropbear-0.52/svr-chansession.c
                        (initgroups(ses.authstate.pw_name, 
 -                                              ses.authstate.pw_gid) < 0)) {
 +                                              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");
+                       dropbear_exit("Error changing user group");

                }
 -              if (setuid(ses.authstate.pw_uid) < 0) {
 +              if ((ses.authstate.pw_uid != 0) && (setuid(ses.authstate.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");
+                       dropbear_exit("Error changing user");

                }
        } else {
                }
        } else {