diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2011-03-02 14:20:51 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2011-03-02 14:20:51 +0000 |
| commit | a42baad83cace9b9625a75b6b8720ef539ef739b (patch) | |
| tree | 354147a1d54c7195d5cf9a21074ab79e101478da /package/dropbear/patches | |
| parent | 64eeb3622360be041b6914f49065ce00e101f7a3 (diff) | |
| download | upstream-a42baad83cace9b9625a75b6b8720ef539ef739b.tar.gz upstream-a42baad83cace9b9625a75b6b8720ef539ef739b.tar.bz2 upstream-a42baad83cace9b9625a75b6b8720ef539ef739b.zip | |
[package/dropbear]: upgrade to 0.53.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25830 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dropbear/patches')
| -rw-r--r-- | package/dropbear/patches/110-change_user.patch | 6 | ||||
| -rw-r--r-- | package/dropbear/patches/120-use_small_code.patch | 11 | ||||
| -rw-r--r-- | package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch index 964229bd74..f003c276cf 100644 --- a/package/dropbear/patches/110-change_user.patch +++ b/package/dropbear/patches/110-change_user.patch @@ -1,6 +1,6 @@ --- a/svr-chansession.c +++ b/svr-chansession.c -@@ -852,12 +852,12 @@ static void execchild(void *user_data) { +@@ -881,12 +881,12 @@ static void execchild(void *user_data) { /* We can only change uid/gid as root ... */ if (getuid() == 0) { @@ -9,10 +9,10 @@ (initgroups(ses.authstate.pw_name, - ses.authstate.pw_gid) < 0)) { + ses.authstate.pw_gid) < 0))) { - dropbear_exit("error changing user group"); + dropbear_exit("Error changing user group"); } - if (setuid(ses.authstate.pw_uid) < 0) { + if ((ses.authstate.pw_uid != 0) && (setuid(ses.authstate.pw_uid) < 0)) { - dropbear_exit("error changing user"); + dropbear_exit("Error changing user"); } } else { diff --git a/package/dropbear/patches/120-use_small_code.patch b/package/dropbear/patches/120-use_small_code.patch new file mode 100644 index 0000000000..98a760fab7 --- /dev/null +++ b/package/dropbear/patches/120-use_small_code.patch @@ -0,0 +1,11 @@ +--- a/options.h ++++ b/options.h +@@ -49,7 +49,7 @@ + several kB in binary size however will make the symmetrical ciphers and hashes + slower, perhaps by 50%. Recommended for small systems that aren't doing + much traffic. */ +-/*#define DROPBEAR_SMALL_CODE*/ ++#define DROPBEAR_SMALL_CODE + + /* Enable X11 Forwarding - server only */ + #define ENABLE_X11FWD diff --git a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch index 7c4306c368..93647a99e5 100644 --- a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch @@ -1,6 +1,6 @@ --- a/cli-runopts.c +++ b/cli-runopts.c -@@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv) +@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -11,7 +11,7 @@ case 'F': case 'e': case 'c': -@@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv) +@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv) #ifndef ENABLE_CLI_LOCALTCPFWD case 'L': #endif |