4 files changed, 3 insertions, 5 deletions

diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c
index 38bec00e5c0e..d39040b96158 100644
--- a/crypto/openssh/channels.c
+++ b/crypto/openssh/channels.c
@@ -133,7 +133,7 @@ static int all_opens_permitted = 0;
 static int have_hostname_in_open = 0;
 
 /* AF_UNSPEC or AF_INET or AF_INET6 */
-extern int IPv4or6;
+int IPv4or6 = AF_UNSPEC;
 
 void	 port_open_helper(Channel *c, char *rtype);
 
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index 4b48a7ce92d2..0ed1ec1e93e7 100644
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -74,7 +74,7 @@ extern char *__progname;
 
 /* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
    Default value is AF_UNSPEC means both IPv4 and IPv6. */
-int IPv4or6 = AF_UNSPEC;
+extern int IPv4or6;
 
 /* Flag indicating whether debug mode is on.  This can be set on the command line. */
 int debug_flag = 0;
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 933a2b4946e8..103d45825469 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -103,7 +103,7 @@ char *config_file_name = _PATH_SERVER_CONFIG_FILE;
  * Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
  * Default value is AF_UNSPEC means both IPv4 and IPv6.
  */
-int IPv4or6 = AF_UNSPEC;
+extern int IPv4or6;
 
 /*
  * Debug mode flag.  This can be set on the command line.  If debug
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index ed39abfcb899..91f07524f10e 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$");
 #include "log.h"
 #include "pam_ssh.h"
 
-int IPv4or6 = AF_UNSPEC;
-
 /*
  * Generic cleanup function for SSH "Key" type.
  */