diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-10-03 17:34:59 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-10-03 17:34:59 +0000 |
commit | 908afed17f97a3f5814f8d0d16be27b9f487f93d (patch) | |
tree | 8d4ed0546f99b25ad8c53cd7b3e8691f1181dc93 | |
parent | 3e45e4cd003fd9aa5ae1556afd4ba405904b761f (diff) |
- markus@cvs.openbsd.org 2001/10/01 21:38:53
[channels.c channels.h ssh.c sshd.c]
remove ugliness; vp@drexel.edu via angelos
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 10 | ||||
-rw-r--r-- | channels.h | 5 | ||||
-rw-r--r-- | ssh.c | 3 | ||||
-rw-r--r-- | sshd.c | 3 |
5 files changed, 19 insertions, 7 deletions
@@ -24,6 +24,9 @@ | |||
24 | [scp.c] | 24 | [scp.c] |
25 | skip filenames containing \n; report jdamery@chiark.greenend.org.uk | 25 | skip filenames containing \n; report jdamery@chiark.greenend.org.uk |
26 | and matthew@debian.org | 26 | and matthew@debian.org |
27 | - markus@cvs.openbsd.org 2001/10/01 21:38:53 | ||
28 | [channels.c channels.h ssh.c sshd.c] | ||
29 | remove ugliness; vp@drexel.edu via angelos | ||
27 | 30 | ||
28 | 20011001 | 31 | 20011001 |
29 | - (stevesk) loginrec.c: fix type conversion problems exposed when using | 32 | - (stevesk) loginrec.c: fix type conversion problems exposed when using |
@@ -6616,4 +6619,4 @@ | |||
6616 | - Wrote replacements for strlcpy and mkdtemp | 6619 | - Wrote replacements for strlcpy and mkdtemp |
6617 | - Released 1.0pre1 | 6620 | - Released 1.0pre1 |
6618 | 6621 | ||
6619 | $Id: ChangeLog,v 1.1576 2001/10/03 17:30:58 mouring Exp $ | 6622 | $Id: ChangeLog,v 1.1577 2001/10/03 17:34:59 mouring Exp $ |
diff --git a/channels.c b/channels.c index 65cf2ab9e..12affdc34 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.134 2001/09/17 21:04:01 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.135 2001/10/01 21:38:53 markus Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -133,7 +133,7 @@ static char *auth_sock_name = NULL; | |||
133 | static char *auth_sock_dir = NULL; | 133 | static char *auth_sock_dir = NULL; |
134 | 134 | ||
135 | /* AF_UNSPEC or AF_INET or AF_INET6 */ | 135 | /* AF_UNSPEC or AF_INET or AF_INET6 */ |
136 | extern int IPv4or6; | 136 | static int IPv4or6 = AF_UNSPEC; |
137 | 137 | ||
138 | /* helper */ | 138 | /* helper */ |
139 | static void port_open_helper(Channel *c, char *rtype); | 139 | static void port_open_helper(Channel *c, char *rtype); |
@@ -2037,6 +2037,12 @@ channel_input_port_open(int type, int plen, void *ctxt) | |||
2037 | 2037 | ||
2038 | /* -- tcp forwarding */ | 2038 | /* -- tcp forwarding */ |
2039 | 2039 | ||
2040 | void | ||
2041 | channel_set_af(int af) | ||
2042 | { | ||
2043 | IPv4or6 = af; | ||
2044 | } | ||
2045 | |||
2040 | /* | 2046 | /* |
2041 | * Initiate forwarding of connections to local port "port" through the secure | 2047 | * Initiate forwarding of connections to local port "port" through the secure |
2042 | * channel to host:port from remote side. | 2048 | * channel to host:port from remote side. |
diff --git a/channels.h b/channels.h index a13004838..c6d1aabc7 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.46 2001/09/17 20:52:47 markus Exp $"); */ | 35 | /* RCSID("$OpenBSD: channels.h,v 1.47 2001/10/01 21:38:53 markus Exp $"); */ |
36 | 36 | ||
37 | #ifndef CHANNEL_H | 37 | #ifndef CHANNEL_H |
38 | #define CHANNEL_H | 38 | #define CHANNEL_H |
@@ -182,7 +182,8 @@ int channel_still_open(void); | |||
182 | char *channel_open_message(void); | 182 | char *channel_open_message(void); |
183 | int channel_find_open(void); | 183 | int channel_find_open(void); |
184 | 184 | ||
185 | /* channel_tcpfwd.c */ | 185 | /* tcp forwarding */ |
186 | void channel_set_af(int af); | ||
186 | void channel_permit_all_opens(void); | 187 | void channel_permit_all_opens(void); |
187 | void channel_add_permitted_opens(char *, int); | 188 | void channel_add_permitted_opens(char *, int); |
188 | void channel_clear_permitted_opens(void); | 189 | void channel_clear_permitted_opens(void); |
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.145 2001/09/28 15:46:29 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.146 2001/10/01 21:38:53 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -564,6 +564,7 @@ again: | |||
564 | 564 | ||
565 | SSLeay_add_all_algorithms(); | 565 | SSLeay_add_all_algorithms(); |
566 | ERR_load_crypto_strings(); | 566 | ERR_load_crypto_strings(); |
567 | channel_set_af(IPv4or6); | ||
567 | 568 | ||
568 | /* Initialize the command to execute on remote host. */ | 569 | /* Initialize the command to execute on remote host. */ |
569 | buffer_init(&command); | 570 | buffer_init(&command); |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.204 2001/08/23 17:59:31 camield Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.205 2001/10/01 21:38:53 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -669,6 +669,7 @@ main(int ac, char **av) | |||
669 | } | 669 | } |
670 | } | 670 | } |
671 | SSLeay_add_all_algorithms(); | 671 | SSLeay_add_all_algorithms(); |
672 | channel_set_af(IPv4or6); | ||
672 | 673 | ||
673 | /* | 674 | /* |
674 | * Force logging to stderr until we have loaded the private host | 675 | * Force logging to stderr until we have loaded the private host |