summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure4
-rw-r--r--src/channels.cpp1
-rw-r--r--src/modules/m_spanningtree/main.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 6fba700ce..1ff8da63b 100755
--- a/configure
+++ b/configure
@@ -153,12 +153,12 @@ chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`);
chomp(our $gnutls_ver = $config{HAS_GNUTLS});
chomp(our $openssl_ver = $config{HAS_OPENSSL});
-$config{USE_GNUTLS} = "n";
+$config{USE_GNUTLS} = 0;
if (defined $opt_use_gnutls)
{
$config{USE_GNUTLS} = "y"; # Use gnutls.
}
-$config{USE_OPENSSL} = "n"; # Use openssl.
+$config{USE_OPENSSL} = 0; # Use openssl.
if (defined $opt_use_openssl)
{
$config{USE_OPENSSL} = "y";
diff --git a/src/channels.cpp b/src/channels.cpp
index cab4fb739..afc569909 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -337,7 +337,6 @@ void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, boo
{
// If the user was granted prefix modes (in the OnUserPreJoin hook, or he's a
// remote user and his own server set the modes), then set them internally now
- memb->modes = *privs;
for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i)
{
ModeHandler* mh = ServerInstance->Modes->FindMode(*i, MODETYPE_CHANNEL);
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index d9a3afbd4..9c2f3969a 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -688,6 +688,8 @@ void ModuleSpanningTree::OnLoadModule(Module* mod)
void ModuleSpanningTree::OnUnloadModule(Module* mod)
{
+ if (!Utils)
+ return;
ServerInstance->PI->SendMetaData(NULL, "modules", "-" + mod->ModuleSourceFile);
unsigned int items = Utils->TreeRoot->ChildCount();