diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 4 | ||||
-rw-r--r-- | channels.h | 4 | ||||
-rw-r--r-- | clientloop.c | 4 |
4 files changed, 10 insertions, 7 deletions
@@ -111,6 +111,9 @@ | |||
111 | - stevesk@cvs.openbsd.org 2001/06/29 18:40:28 | 111 | - stevesk@cvs.openbsd.org 2001/06/29 18:40:28 |
112 | [channels.c] | 112 | [channels.c] |
113 | use socklen_t for getsockopt arg #5; ok markus@ | 113 | use socklen_t for getsockopt arg #5; ok markus@ |
114 | - stevesk@cvs.openbsd.org 2001/06/30 18:08:40 | ||
115 | [channels.c channels.h clientloop.c] | ||
116 | adress -> address; ok markus@ | ||
114 | 117 | ||
115 | 20010629 | 118 | 20010629 |
116 | - (bal) Removed net_aton() since we don't use it any more | 119 | - (bal) Removed net_aton() since we don't use it any more |
@@ -5938,4 +5941,4 @@ | |||
5938 | - Wrote replacements for strlcpy and mkdtemp | 5941 | - Wrote replacements for strlcpy and mkdtemp |
5939 | - Released 1.0pre1 | 5942 | - Released 1.0pre1 |
5940 | 5943 | ||
5941 | $Id: ChangeLog,v 1.1371 2001/07/04 05:13:35 mouring Exp $ | 5944 | $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 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.129 2001/06/29 18:40:28 stevesk Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.130 2001/06/30 18:08:39 stevesk Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -2270,7 +2270,7 @@ connect_to(const char *host, u_short port) | |||
2270 | } | 2270 | } |
2271 | 2271 | ||
2272 | int | 2272 | int |
2273 | channel_connect_by_listen_adress(u_short listen_port) | 2273 | channel_connect_by_listen_address(u_short listen_port) |
2274 | { | 2274 | { |
2275 | int i; | 2275 | int i; |
2276 | 2276 | ||
diff --git a/channels.h b/channels.h index 98bba1aed..c36f66b68 100644 --- a/channels.h +++ b/channels.h | |||
@@ -32,7 +32,7 @@ | |||
32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
34 | */ | 34 | */ |
35 | /* RCSID("$OpenBSD: channels.h,v 1.42 2001/06/26 17:27:23 markus Exp $"); */ | 35 | /* RCSID("$OpenBSD: channels.h,v 1.43 2001/06/30 18:08:40 stevesk Exp $"); */ |
36 | 36 | ||
37 | #ifndef CHANNEL_H | 37 | #ifndef CHANNEL_H |
38 | #define CHANNEL_H | 38 | #define CHANNEL_H |
@@ -184,7 +184,7 @@ void channel_add_permitted_opens(char *, int); | |||
184 | void channel_clear_permitted_opens(void); | 184 | void channel_clear_permitted_opens(void); |
185 | void channel_input_port_forward_request(int, int); | 185 | void channel_input_port_forward_request(int, int); |
186 | int channel_connect_to(const char *, u_short); | 186 | int channel_connect_to(const char *, u_short); |
187 | int channel_connect_by_listen_adress(u_short); | 187 | int channel_connect_by_listen_address(u_short); |
188 | void channel_request_remote_forwarding(u_short, const char *, u_short); | 188 | void channel_request_remote_forwarding(u_short, const char *, u_short); |
189 | int channel_request_local_forwarding(u_short, const char *, u_short, int); | 189 | int channel_request_local_forwarding(u_short, const char *, u_short, int); |
190 | int | 190 | int |
diff --git a/clientloop.c b/clientloop.c index 70619aa60..83b2d4d8e 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.79 2001/06/29 18:38:44 stevesk Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.80 2001/06/30 18:08:40 stevesk Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1055,7 +1055,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) | |||
1055 | debug("client_request_forwarded_tcpip: listen %s port %d, originator %s port %d", | 1055 | debug("client_request_forwarded_tcpip: listen %s port %d, originator %s port %d", |
1056 | listen_address, listen_port, originator_address, originator_port); | 1056 | listen_address, listen_port, originator_address, originator_port); |
1057 | 1057 | ||
1058 | sock = channel_connect_by_listen_adress(listen_port); | 1058 | sock = channel_connect_by_listen_address(listen_port); |
1059 | if (sock < 0) { | 1059 | if (sock < 0) { |
1060 | xfree(originator_address); | 1060 | xfree(originator_address); |
1061 | xfree(listen_address); | 1061 | xfree(listen_address); |