1
0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-11-19 06:54:58 +01:00

package/dropbear: refresh patches

SVN-Revision: 20460
This commit is contained in:
Gabor Juhos 2010-03-26 14:28:14 +00:00
parent 17b8b81564
commit a346b400c6
4 changed files with 13 additions and 20 deletions

@ -1,7 +1,6 @@
diff -ur dropbear-0.52.orig/svr-authpubkey.c dropbear-0.52/svr-authpubkey.c --- a/svr-authpubkey.c
--- dropbear-0.52.orig/svr-authpubkey.c 2009-04-08 00:32:16.000000000 +0200 +++ b/svr-authpubkey.c
+++ dropbear-0.52/svr-authpubkey.c 2009-04-08 00:44:11.000000000 +0200 @@ -209,17 +209,21 @@ static int checkpubkey(unsigned char* al
@@ -209,17 +209,21 @@
goto out; goto out;
} }
@ -34,7 +33,7 @@ diff -ur dropbear-0.52.orig/svr-authpubkey.c dropbear-0.52/svr-authpubkey.c
if (authfile == NULL) { if (authfile == NULL) {
goto out; goto out;
} }
@@ -372,26 +376,35 @@ @@ -372,26 +376,35 @@ static int checkpubkeyperms() {
goto out; goto out;
} }

@ -1,8 +1,6 @@
Index: dropbear-0.52/svr-chansession.c --- a/svr-chansession.c
=================================================================== +++ b/svr-chansession.c
--- dropbear-0.52.orig/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700 @@ -852,12 +852,12 @@ static void execchild(void *user_data) {
+++ dropbear-0.52/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700
@@ -852,12 +852,12 @@
/* We can only change uid/gid as root ... */ /* We can only change uid/gid as root ... */
if (getuid() == 0) { if (getuid() == 0) {

@ -1,8 +1,6 @@
Index: dropbear-0.52/cli-runopts.c --- a/cli-runopts.c
=================================================================== +++ b/cli-runopts.c
--- dropbear-0.52.orig/cli-runopts.c 2008-04-22 17:29:49.000000000 -0700 @@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv)
+++ dropbear-0.52/cli-runopts.c 2008-04-22 17:29:50.000000000 -0700
@@ -271,6 +271,10 @@
debug_trace = 1; debug_trace = 1;
break; break;
#endif #endif
@ -13,7 +11,7 @@ Index: dropbear-0.52/cli-runopts.c
case 'F': case 'F':
case 'e': case 'e':
case 'c': case 'c':
@@ -282,7 +286,6 @@ @@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv)
#ifndef ENABLE_CLI_LOCALTCPFWD #ifndef ENABLE_CLI_LOCALTCPFWD
case 'L': case 'L':
#endif #endif

@ -1,7 +1,5 @@
Index: dropbear-0.52/options.h --- a/options.h
=================================================================== +++ b/options.h
--- dropbear-0.52.orig/options.h 2008-04-22 17:29:49.000000000 -0700
+++ dropbear-0.52/options.h 2008-04-22 17:29:50.000000000 -0700
@@ -5,6 +5,11 @@ @@ -5,6 +5,11 @@
#ifndef _OPTIONS_H_ #ifndef _OPTIONS_H_
#define _OPTIONS_H_ #define _OPTIONS_H_