summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2008-11-11 14:08:48 +0000
committerMatt Johnston <matt@ucc.asn.au>2008-11-11 14:08:48 +0000
commit1eb3a9e7b47287199170d8ea327022d956d8d48e (patch)
treedf4ff86de7eaa2146a7ed34387c890da62105f9c
parentaf296c743fbafeab297db7192f54a5efcc3201f2 (diff)
downloaddropbear-1eb3a9e7b47287199170d8ea327022d956d8d48e.tar.gz
- Bump to 0.52
- Clarify that hosts are resolved on the remote end for multihop
-rw-r--r--dbclient.16
-rw-r--r--debian/changelog6
-rw-r--r--debian/dropbear.postinst2
-rw-r--r--debug.h2
-rw-r--r--sysoptions.h2
5 files changed, 14 insertions, 4 deletions
diff --git a/dbclient.1 b/dbclient.1
index 4ab786e..96e6c5c 100644
--- a/dbclient.1
+++ b/dbclient.1
@@ -102,7 +102,7 @@ Use the standard input/output of the program \fIproxy_command\fR rather than usi
a normal TCP connection. A hostname should be still be provided, as this is used for
comparing saved hostkeys.
.TP
-.B \B \fIendhost:endport
+.B \-B \fIendhost:endport
"Netcat-alike" mode, where Dropbear will connect to the given host, then create a
forwarded connection to \fIendhost\fR. This will then be presented as dbclient's
standard input/output.
@@ -117,6 +117,10 @@ ssh/rsh command). A file can be "bounced" through multiple SSH hops, eg
scp -S dbclient matt@martello,root@wrt,canyons:/tmp/dump .
+Note that hostnames are resolved by the prior hop (so "canyons" would be resolved by the host "wrt")
+in the example above, the same way as other -L TCP forwarded hosts are. Host keys are
+checked locally based on the given hostname.
+
.SH ENVIRONMENT
.TP
.B DROPBEAR_PASSWORD
diff --git a/debian/changelog b/debian/changelog
index f51769b..bb60b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dropbear (0.52-0.1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Matt Johnston <matt@ucc.asn.au> Tues, 11 Nov 2008 22:54:00 +0900
+
dropbear (0.51-0.1) unstable; urgency=low
* New upstream release.
diff --git a/debian/dropbear.postinst b/debian/dropbear.postinst
index 7c95cfa..2491e45 100644
--- a/debian/dropbear.postinst
+++ b/debian/dropbear.postinst
@@ -71,7 +71,7 @@ if test -x /etc/init.d/dropbear; then
fi
if test -n "$2" && dpkg --compare-versions "$2" lt '0.50-4' &&
-update-service --check dropbear; then
+update-service --check dropbear 2>/dev/null; then
update-service --remove /etc/dropbear 2>/dev/null || :
sleep 6
rm -rf /var/run/dropbear /var/run/dropbear.log
diff --git a/debug.h b/debug.h
index a9cc0bd..b8c2a57 100644
--- a/debug.h
+++ b/debug.h
@@ -39,7 +39,7 @@
* Caution: Don't use this in an unfriendly environment (ie unfirewalled),
* since the printing may not sanitise strings etc. This will add a reasonable
* amount to your executable size. */
-#define DEBUG_TRACE
+/*#define DEBUG_TRACE*/
/* All functions writing to the cleartext payload buffer call
* CHECKCLEARTOWRITE() before writing. This is only really useful if you're
diff --git a/sysoptions.h b/sysoptions.h
index 4b0d60a..c98e1ec 100644
--- a/sysoptions.h
+++ b/sysoptions.h
@@ -4,7 +4,7 @@
*******************************************************************/
#ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "0.51"
+#define DROPBEAR_VERSION "0.52"
#endif
#define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION