KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update dropbear to new upstream release (v0.46)

Browse source 
SVN-Revision: 2195
This commit is contained in:
Nicolas Thill 2005-10-20 13:55:42 +00:00
parent a2c8ba48f8
commit 9f7fad00fe
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
PKG_NAME:=dropbear
PKG_VERSION:=0.45
PKG_RELEASE:=4
PKG_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e
PKG_VERSION:=0.46
PKG_RELEASE:=1
PKG_MD5SUM:=f0e535a62b57e5bde9ecba4a11402178
PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
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
+++ 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 {