X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bcfd578c6d587a7512d4edb16791cd51804817bd..a3eeda1387d629c7f9f25e480bca2a0636835560:/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 ac617e280..964229bd7 100644
--- a/package/dropbear/patches/110-change_user.patch
+++ b/package/dropbear/patches/110-change_user.patch
@@ -1,19 +1,18 @@
-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 @@
+--- 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 {