diff options
| author | Andy Boyett <agb@openwrt.org> | 2008-07-24 05:24:52 +0000 |
|---|---|---|
| committer | Andy Boyett <agb@openwrt.org> | 2008-07-24 05:24:52 +0000 |
| commit | d9103824d984d733877749d01098704c886fb8d2 (patch) | |
| tree | 3d9eb2d481985be1ddba3e355008019ac34e3f98 /package/dropbear/patches/110-change_user.patch | |
| parent | 89a046fb8696a6117d62e43415f121f33fd5fa3b (diff) | |
| download | upstream-d9103824d984d733877749d01098704c886fb8d2.tar.gz upstream-d9103824d984d733877749d01098704c886fb8d2.tar.bz2 upstream-d9103824d984d733877749d01098704c886fb8d2.zip | |
dropbear: upgrade to 0.51
- 160-tty_close merged upstream
- patches refreshed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11913 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dropbear/patches/110-change_user.patch')
| -rw-r--r-- | package/dropbear/patches/110-change_user.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch index 20bb41c2d2..4a0cdc5e75 100644 --- a/package/dropbear/patches/110-change_user.patch +++ b/package/dropbear/patches/110-change_user.patch @@ -1,20 +1,20 @@ -Index: dropbear-0.50/svr-chansession.c +Index: dropbear-0.51/svr-chansession.c =================================================================== ---- dropbear-0.50.orig/svr-chansession.c 2007-08-10 23:47:48.000000000 +0200 -+++ dropbear-0.50/svr-chansession.c 2007-08-10 23:47:48.000000000 +0200 -@@ -908,12 +908,12 @@ +--- dropbear-0.51.orig/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700 ++++ dropbear-0.51/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700 +@@ -912,12 +912,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 { |