X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b5cb1795de1f0959de1e228bd2e784d1cea921a7..a7ac823d06891e22f25eca8596906743d895eaa2:/package/dropbear/patches/110-change_user.patch?ds=sidebyside

diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch
index 9a9a6afda..964229bd7 100644
--- a/package/dropbear/patches/110-change_user.patch
+++ b/package/dropbear/patches/110-change_user.patch
@@ -1,20 +1,18 @@
-Index: dropbear-0.49/svr-chansession.c
-===================================================================
---- dropbear-0.49.orig/svr-chansession.c	2007-06-04 13:21:39.455978448 +0200
-+++ dropbear-0.49/svr-chansession.c	2007-06-04 13:21:39.751933456 +0200
-@@ -908,12 +908,12 @@
+--- a/svr-chansession.c
++++ b/svr-chansession.c
+@@ -852,12 +852,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))) {
+-		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 {