Make default virtual host work for .12, and make IPv4-only

[ircu2.10.12-pk.git] / ircd / s_bsd.c

diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index b0bc051a0a9fbee973fd304a2c7ff339d7cee992..8d14b451fbb1a5ecee0f151a003af218074bdba3 100644 (file)
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -236,10 +236,8 @@ static int connect_inet(struct ConfItem* aconf, struct Client* cptr)
    */
   if (irc_in_addr_valid(&aconf->origin.addr))
     local = &aconf->origin;
-  else if (feature_bool(FEAT_VIRTUAL_HOST))
-    local = &VirtualHost;
   else
-    local = NULL;
+    local = &VirtualHost;
   cli_fd(cptr) = os_socket(local, SOCK_STREAM, cli_name(cptr));
   if (cli_fd(cptr) < 0)
     return 0;
@@ -898,15 +896,6 @@ int connect_server(struct ConfItem* aconf, struct Client* by)
     completed_connection(cptr) : 1;
 }
 
-/*
- * Setup local socket structure to use for binding to.
- */
-void set_virtual_host(const struct irc_in_addr *addr)
-{
-  memset(&VirtualHost, 0, sizeof(VirtualHost));
-  memcpy(&VirtualHost.addr, addr, sizeof(VirtualHost.addr));
-}
-
 /*
  * Find the real hostname for the host running the server (or one which
  * matches the server's name) and its primary IP#.  Hostname is stored