From 173e646f7e04e559feb8815c27f2ffb13581d91e Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Wed, 4 Jul 2001 05:15:15 +0000 Subject: [PATCH] - stevesk@cvs.openbsd.org 2001/06/30 18:08:40 [channels.c channels.h clientloop.c] adress -> address; ok markus@ --- ChangeLog | 5 ++++- channels.c | 4 ++-- channels.h | 4 ++-- clientloop.c | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a033e905f..0a1537800 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,9 @@ - stevesk@cvs.openbsd.org 2001/06/29 18:40:28 [channels.c] use socklen_t for getsockopt arg #5; ok markus@ + - stevesk@cvs.openbsd.org 2001/06/30 18:08:40 + [channels.c channels.h clientloop.c] + adress -> address; ok markus@ 20010629 - (bal) Removed net_aton() since we don't use it any more @@ -5938,4 +5941,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1371 2001/07/04 05:13:35 mouring Exp $ +$Id: ChangeLog,v 1.1372 2001/07/04 05:15:15 mouring Exp $ diff --git a/channels.c b/channels.c index 937e059cc..18b6c468e 100644 --- a/channels.c +++ b/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.129 2001/06/29 18:40:28 stevesk Exp $"); +RCSID("$OpenBSD: channels.c,v 1.130 2001/06/30 18:08:39 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2270,7 +2270,7 @@ connect_to(const char *host, u_short port) } int -channel_connect_by_listen_adress(u_short listen_port) +channel_connect_by_listen_address(u_short listen_port) { int i; diff --git a/channels.h b/channels.h index 98bba1aed..c36f66b68 100644 --- a/channels.h +++ b/channels.h @@ -32,7 +32,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: channels.h,v 1.42 2001/06/26 17:27:23 markus Exp $"); */ +/* RCSID("$OpenBSD: channels.h,v 1.43 2001/06/30 18:08:40 stevesk Exp $"); */ #ifndef CHANNEL_H #define CHANNEL_H @@ -184,7 +184,7 @@ void channel_add_permitted_opens(char *, int); void channel_clear_permitted_opens(void); void channel_input_port_forward_request(int, int); int channel_connect_to(const char *, u_short); -int channel_connect_by_listen_adress(u_short); +int channel_connect_by_listen_address(u_short); void channel_request_remote_forwarding(u_short, const char *, u_short); int channel_request_local_forwarding(u_short, const char *, u_short, int); int diff --git a/clientloop.c b/clientloop.c index 70619aa60..83b2d4d8e 100644 --- a/clientloop.c +++ b/clientloop.c @@ -59,7 +59,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.79 2001/06/29 18:38:44 stevesk Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.80 2001/06/30 18:08:40 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1055,7 +1055,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) debug("client_request_forwarded_tcpip: listen %s port %d, originator %s port %d", listen_address, listen_port, originator_address, originator_port); - sock = channel_connect_by_listen_adress(listen_port); + sock = channel_connect_by_listen_address(listen_port); if (sock < 0) { xfree(originator_address); xfree(listen_address);