Fixing a crash bug in dropbear.
This commit is contained in:
parent
ae98b61850
commit
83dee22f4a
@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
|
|||||||
# Allow sessions to inherit the PATH from the parent dropbear.
|
# Allow sessions to inherit the PATH from the parent dropbear.
|
||||||
# Otherwise they only get the usual /bin:/usr/bin kind of PATH
|
# Otherwise they only get the usual /bin:/usr/bin kind of PATH
|
||||||
./pass-path.patch
|
./pass-path.patch
|
||||||
|
|
||||||
|
# Bugfix
|
||||||
|
# http://article.gmane.org/gmane.network.ssh.dropbear/1361
|
||||||
|
./proxycrash.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ zlib ];
|
buildInputs = [ zlib ];
|
||||||
|
17
pkgs/tools/networking/dropbear/proxycrash.patch
Normal file
17
pkgs/tools/networking/dropbear/proxycrash.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff -r 5ba19d00da08 cli-runopts.c
|
||||||
|
--- a/cli-runopts.c Sun May 26 18:43:00 2013 +0800
|
||||||
|
+++ b/cli-runopts.c Mon Jun 17 19:51:08 2013 +0000
|
||||||
|
@@ -383,6 +383,13 @@
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef ENABLE_CLI_PROXYCMD
|
||||||
|
+ if (cli_opts.proxycmd) {
|
||||||
|
+ /* To match the common path of m_freeing it */
|
||||||
|
+ cli_opts.proxycmd = m_strdup(cli_opts.proxycmd);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (cli_opts.remoteport == NULL) {
|
||||||
|
cli_opts.remoteport = "22";
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user