From aee2fb0c9127949959cfd8a5b50bd35744757f50 Mon Sep 17 00:00:00 2001
From: Markus Friedl <markus@cvs.openbsd.org>
Date: Mon, 1 Oct 2001 21:38:54 +0000
Subject: remove ugliness; vp@drexel.edu via angelos

---
 usr.bin/ssh/channels.c | 10 ++++++++--
 usr.bin/ssh/channels.h |  5 +++--
 usr.bin/ssh/ssh.c      |  3 ++-
 usr.bin/ssh/sshd.c     |  3 ++-
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 82cf8fe077b..6a8cec5fef1 100644
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.134 2001/09/17 21:04:01 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.135 2001/10/01 21:38:53 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -133,7 +133,7 @@ static char *auth_sock_name = NULL;
 static char *auth_sock_dir = NULL;
 
 /* AF_UNSPEC or AF_INET or AF_INET6 */
-extern int IPv4or6;
+static int IPv4or6 = AF_UNSPEC;
 
 /* helper */
 static void port_open_helper(Channel *c, char *rtype);
@@ -2037,6 +2037,12 @@ channel_input_port_open(int type, int plen, void *ctxt)
 
 /* -- tcp forwarding */
 
+void
+channel_set_af(int af)
+{
+	IPv4or6 = af;
+}
+
 /*
  * Initiate forwarding of connections to local port "port" through the secure
  * channel to host:port from remote side.
diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h
index a1300483894..c6d1aabc744 100644
--- a/usr.bin/ssh/channels.h
+++ b/usr.bin/ssh/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.46 2001/09/17 20:52:47 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.47 2001/10/01 21:38:53 markus Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -182,7 +182,8 @@ int      channel_still_open(void);
 char	*channel_open_message(void);
 int	 channel_find_open(void);
 
-/* channel_tcpfwd.c */
+/* tcp forwarding */
+void	 channel_set_af(int af);
 void     channel_permit_all_opens(void);
 void	 channel_add_permitted_opens(char *, int);
 void	 channel_clear_permitted_opens(void);
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index cef0d5f0243..bf48b5f2639 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.145 2001/09/28 15:46:29 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.146 2001/10/01 21:38:53 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -551,6 +551,7 @@ again:
 
 	SSLeay_add_all_algorithms();
 	ERR_load_crypto_strings();
+	channel_set_af(IPv4or6);
 
 	/* Initialize the command to execute on remote host. */
 	buffer_init(&command);
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 66e395bf53c..9eeb7f663a6 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.204 2001/08/23 17:59:31 camield Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.205 2001/10/01 21:38:53 markus Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -656,6 +656,7 @@ main(int ac, char **av)
 		}
 	}
 	SSLeay_add_all_algorithms();
+	channel_set_af(IPv4or6);
 
 	/*
 	 * Force logging to stderr until we have loaded the private host
-- 
cgit v1.2.3