summaryrefslogtreecommitdiff
path: root/modules/protocol
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-08-17 22:05:47 -0400
committerAdam <Adam@anope.org>2011-08-17 22:05:47 -0400
commit487d828fa0f69d1b425f17499c6f0991b5691c08 (patch)
tree97a82a559bc6438cd67062febc649212fd64bef2 /modules/protocol
parentf41081ba51e81af82f4558aa4663f4d52f0819c4 (diff)
Actually made the nickserv block optional
Diffstat (limited to 'modules/protocol')
-rw-r--r--modules/protocol/inspircd11.cpp2
-rw-r--r--modules/protocol/plexus.cpp15
2 files changed, 9 insertions, 8 deletions
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 4d39c585d..6b97f7487 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -330,7 +330,7 @@ class InspircdIRCdMessage : public IRCdMessage
if (na->nc->HasFlag(NI_UNCONFIRMED))
user->SetMode(findbot(Config->NickServ), UMODE_REGISTERED);
}
- else
+ else if (nickserv)
nickserv->Validate(user);
}
}
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 2379dcc27..b060c76a3 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -288,7 +288,7 @@ class PlexusIRCdMessage : public IRCdMessage
if (ip == "0")
ip.clear();
User *user = do_nick("", params[0], params[4], params[9], source, params[10], Anope::string(params[2]).is_pos_number_only() ? convertTo<time_t>(params[2]) : 0, ip, params[5], params[7], params[3]);
- if (user && user->server->IsSynced())
+ if (nickserv && user && user->server->IsSynced())
nickserv->Validate(user);
return true;
@@ -663,12 +663,13 @@ class ProtoPlexus : public Module
void OnServerSync(Server *s)
{
- for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
- {
- User *u = it->second;
- if (u->server == s && !u->IsIdentified())
- nickserv->Validate(u);
- }
+ if (nickserv)
+ for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
+ {
+ User *u = it->second;
+ if (u->server == s && !u->IsIdentified())
+ nickserv->Validate(u);
+ }
}
};