re-enable ziplinks + ssl

[irc/rqf/shadowircd.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index 35a18f81b91b02f334976bf6d613a9c90d7e551b..9e929f3c9e6c65b37517ef2c0c1c38bdcd3e74ca 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -263,7 +263,7 @@ conf_set_modules_module(void *data)
 #ifndef STATIC_MODULES
        char *m_bn;
 
-       m_bn = irc_basename((char *) data);
+       m_bn = rb_basename((char *) data);
 
        if(findmodule_byname(m_bn) != -1)
                return;
@@ -1243,13 +1243,6 @@ conf_end_connect(struct TopConf *tc)
                yy_server->flags &= ~SERVER_COMPRESSED;
        }
 #endif
-       if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))
-       {
-               conf_report_error("Ignoring compressed for connect block %s -- "
-                                      "ssl and compressed are mutually exclusive (OpenSSL does its own compression)", 
-                                      yy_server->name);
-               yy_server->flags &= ~SERVER_COMPRESSED;
-       }
 
        add_server_conf(yy_server);
        rb_dlinkAdd(yy_server, &yy_server->node, &server_conf_list);