summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/configreader.cpp7
-rw-r--r--src/user_resolver.cpp2
-rw-r--r--src/users.cpp2
3 files changed, 2 insertions, 9 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 2f7a651e6..4a4e97a89 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -82,7 +82,6 @@ bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
else
{
throw ModuleException("BufferedSocket derived class already hooked by another module");
- return false;
}
}
@@ -136,15 +135,9 @@ bool ServerConfig::CheckOnce(const char* tag, ConfigDataHash &newconf)
int count = ConfValueEnum(newconf, tag);
if (count > 1)
- {
throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
- return false;
- }
if (count < 1)
- {
throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required.");
- return false;
- }
return true;
}
diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index edfb64528..b5f03ca09 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -36,7 +36,7 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
/* Check we didnt time out */
if (this->bound_user->registered != REG_ALL)
{
- bool lcached;
+ bool lcached = false;
#ifdef IPV6
if (this->bound_user->GetProtocolFamily() == AF_INET6)
{
diff --git a/src/users.cpp b/src/users.cpp
index de6085084..455bb74ec 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -98,7 +98,7 @@ void User::StartDNSLookup()
{
try
{
- bool cached;
+ bool cached = false;
const char* sip = this->GetIPString(false);
/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */