summaryrefslogtreecommitdiffstats
path: root/package/dropbear/patches
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-20 13:55:42 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-20 13:55:42 +0000
commitdc0f0a5b71d7f781cb33d768279ba315e64ffec7 (patch)
tree45127018a9f09564d30f4aba2221002f831052b0 /package/dropbear/patches
parent3c99e4a1a06925e021a1fd58aac7cfaec6ede9f8 (diff)
update dropbear to new upstream release (v0.46)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2195 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dropbear/patches')
-rw-r--r--package/dropbear/patches/change-user.patch18
1 files changed, 11 insertions, 7 deletions
diff --git a/package/dropbear/patches/change-user.patch b/package/dropbear/patches/change-user.patch
index 3b4a341f7..5ab4a5689 100644
--- a/package/dropbear/patches/change-user.patch
+++ b/package/dropbear/patches/change-user.patch
@@ -1,15 +1,19 @@
---- dropbear-0.44.old/svr-chansession.c 2005-02-03 02:29:44.000000000 +0100
-+++ dropbear-0.44/svr-chansession.c 2005-02-03 02:31:05.000000000 +0100
-@@ -860,10 +860,10 @@
+diff -ruN dropbear-0.46-old/svr-chansession.c dropbear-0.46-new/svr-chansession.c
+--- dropbear-0.46-old/svr-chansession.c 2005-07-08 21:20:59.000000000 +0200
++++ dropbear-0.46-new/svr-chansession.c 2005-07-12 01:39:12.000000000 +0200
+@@ -860,12 +860,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_uid != 0) && ((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) ||
-- (setuid(ses.authstate.pw->pw_uid) < 0)) {
-+ (setuid(ses.authstate.pw->pw_uid) < 0))) {
+- ses.authstate.pw->pw_gid) < 0)) {
++ ses.authstate.pw->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");
}
} else {