1 files changed, 8 insertions, 2 deletions

diff --git a/canohost.c b/canohost.c
index 057f061b6..8ad684d6c 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.40 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.41 2004/07/21 11:51:29 djm Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -382,7 +382,13 @@ get_peer_port(int sock)
 int
 get_remote_port(void)
 {
-        return get_port(0);
+        static int port = -1;
+
+        /* Cache to avoid getpeername() on a dead connection */
+        if (port == -1)
+                port = get_port(0);
+
+        return port;
 }
 
 int