NB: big update - may break stuff. Please test!

 - (djm) OpenBSD CVS sync:
   - markus@cvs.openbsd.org  2001/02/03 03:08:38
     [auth-options.c auth-rh-rsa.c auth-rhosts.c auth.c canohost.c]
     [canohost.h servconf.c servconf.h session.c sshconnect1.c sshd.8]
     [sshd_config]
     make ReverseMappingCheck optional in sshd_config; ok djm@,dugsong@
   - markus@cvs.openbsd.org  2001/02/03 03:19:51
     [ssh.1 sshd.8 sshd_config]
     Skey is now called ChallengeResponse
   - markus@cvs.openbsd.org  2001/02/03 03:43:09
     [sshd.8]
     use no-pty option in .ssh/authorized_keys* if you need a 8-bit clean
     channel. note from Erik.Anggard@cygate.se (pr/1659)
   - stevesk@cvs.openbsd.org 2001/02/03 10:03:06
     [ssh.1]
     typos; ok markus@
   - djm@cvs.openbsd.org     2001/02/04 04:11:56
     [scp.1 sftp-server.c ssh.1 sshd.8 sftp-client.c sftp-client.h]
     [sftp-common.c sftp-common.h sftp-int.c sftp-int.h sftp.1 sftp.c]
     Basic interactive sftp client; ok theo@
 - (djm) Update RPM specs for new sftp binary
 - (djm) Update several bits for new optional reverse lookup stuff. I
   think I got them all.

1 files changed, 6 insertions, 6 deletions

diff --git a/channels.c b/channels.c
index 82a2db05e..d343ac89e 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.85 2001/01/29 19:42:35 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.88 2001/02/01 21:58:08 markus Exp $");
 
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
@@ -600,7 +600,7 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
         struct sockaddr addr;
         int newsock, newch;
         socklen_t addrlen;
-        char buf[1024], *remote_hostname, *rtype;
+        char buf[1024], *remote_ipaddr, *rtype;
         int remote_port;
 
         rtype = (c->type == SSH_CHANNEL_RPORT_LISTENER) ?
@@ -616,13 +616,13 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
                         error("accept: %.100s", strerror(errno));
                         return;
                 }
-                remote_hostname = get_remote_hostname(newsock);
+                remote_ipaddr = get_peer_ipaddr(newsock);
                 remote_port = get_peer_port(newsock);
                 snprintf(buf, sizeof buf,
                     "listen port %d for %.100s port %d, "
                     "connect from %.200s port %d",
                     c->listening_port, c->path, c->host_port,
-                    remote_hostname, remote_port);
+                    remote_ipaddr, remote_port);
 
                 newch = channel_new(rtype,
                     SSH_CHANNEL_OPENING, newsock, newsock, -1,
@@ -644,7 +644,7 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
                                 packet_put_int(c->host_port);
                         }
                         /* originator host and port */
-                        packet_put_cstring(remote_hostname);
+                        packet_put_cstring(remote_ipaddr);
                         packet_put_int(remote_port);
                         packet_send();
                 } else {
@@ -657,7 +657,7 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
                         }
                         packet_send();
                 }
-                xfree(remote_hostname);
+                xfree(remote_ipaddr);
         }
 }