- (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug

   message on some platforms.  Patch from pete at seebeyond.com via djm.

diff --git a/ChangeLog b/ChangeLog
index 5b318dc3efa760cbcdae3905205430218e45b209..a5727914e708e348312cb5ecfe8bb069ccfa7b43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
  - (dtucker) [auth.h sshd.c openbsd-compat/port-aix.c] Bug #1006: fix bug in
    handling of password expiry messages returned by AIX's authentication
    routines, originally reported by robvdwal at sara.nl.
+ - (dtucker) [ssh.c] Prevent null pointer deref in port forwarding debug
+   message on some platforms.  Patch from pete at seebeyond.com via djm.
 
 20050329
  - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're

diff --git a/ssh.c b/ssh.c
index 1f025c78428fd874319ca2ce21332bb69afd7fb2..703cb8bd3168e19ae9ac20b321674b0565bdc4c5 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -876,6 +876,8 @@ ssh_init_forwarding(void)
        for (i = 0; i < options.num_remote_forwards; i++) {
                debug("Remote connections from %.200s:%d forwarded to "
                    "local address %.200s:%d",
+                   (options.remote_forwards[i].listen_host == NULL) ? 
+                   (options.gateway_ports ? "*" : "LOCALHOST") : 
                    options.remote_forwards[i].listen_host,
                    options.remote_forwards[i].listen_port,
                    options.remote_forwards[i].connect_host,