qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-29 20:09:41 +02:00
Code

update dropbear to new upstream release (v0.46)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2195 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2005-10-20 13:55:42 +00:00
parent b4431f5507
commit 3e9e71c0a1
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openwrt/package/dropbear/Makefile
View File

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear PKG_NAME:=dropbear
PKG_VERSION:=0.45 PKG_VERSION:=0.46
PKG_RELEASE:=4 PKG_RELEASE:=1
PKG_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e PKG_MD5SUM:=f0e535a62b57e5bde9ecba4a11402178
PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

18
openwrt/package/dropbear/patches/change-user.patch
View File

@ -1,15 +1,19 @@
--- dropbear-0.44.old/svr-chansession.c 2005-02-03 02:29:44.000000000 +0100 diff -ruN dropbear-0.46-old/svr-chansession.c dropbear-0.46-new/svr-chansession.c
+++ dropbear-0.44/svr-chansession.c 2005-02-03 02:31:05.000000000 +0100 --- dropbear-0.46-old/svr-chansession.c 2005-07-08 21:20:59.000000000 +0200
@@ -860,10 +860,10 @@ +++ 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 ... */ /* We can only change uid/gid as root ... */
if (getuid() == 0) { if (getuid() == 0) {
- if ((setgid(ses.authstate.pw->pw_gid) < 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, (initgroups(ses.authstate.pw->pw_name,
ses.authstate.pw->pw_gid) < 0) || - ses.authstate.pw->pw_gid) < 0)) {
- (setuid(ses.authstate.pw->pw_uid) < 0)) { + ses.authstate.pw->pw_gid) < 0))) {
+ (setuid(ses.authstate.pw->pw_uid) < 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"); dropbear_exit("error changing user");
} }
} else { } else {