summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-08-02 22:39:14 -0400
committerAdam <Adam@anope.org>2011-08-02 22:39:14 -0400
commit42f954ff7dcfe5a8369c1c5c87cb33b0a1ec9979 (patch)
treeb59b12d1398a8631e17d1a3ef032f4860515e907
parent09f5591abac6b29b7c2b41b4747c2b523efa6c63 (diff)
Fixed reintroducing our clients if we disconnect and reconnect to the uplink
-rw-r--r--data/example.conf2
-rw-r--r--modules/protocol/bahamut.cpp2
-rw-r--r--modules/protocol/inspircd-ts6.h2
-rw-r--r--src/main.cpp4
4 files changed, 3 insertions, 7 deletions
diff --git a/data/example.conf b/data/example.conf
index e77c276fb..e44533461 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -1403,7 +1403,7 @@ log
* chanserv/saset/peace chanserv/saset/persist chanserv/saset/private
* chanserv/saset/secure chanserv/saset/securefounder chanserv/saset/secureops
* chanserv/saset/signkick chanserv/saset/successor chanserv/saset/topiclock
- * chanserv/saset/url chanserv/saset/xop chanserv/saset/noexpire
+ * chanserv/saset/url chanserv/saset/noexpire
*
* memoserv/sendall memoserv/staff
*
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index ece676f22..67efb0953 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -420,7 +420,7 @@ class BahamutIRCdMessage : public IRCdMessage
ChannelMode *cm = ModeManager::FindChannelModeByChar(ch);
if (!cm)
{
- Log() << "Receeved unknown mode prefix " << cm << " in SJOIN string";
+ Log() << "Received unknown mode prefix " << cm << " in SJOIN string";
continue;
}
diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h
index d58e1c987..2a60062b2 100644
--- a/modules/protocol/inspircd-ts6.h
+++ b/modules/protocol/inspircd-ts6.h
@@ -389,7 +389,7 @@ class InspircdIRCdMessage : public IRCdMessage
ChannelMode *cm = ModeManager::FindChannelModeByChar(buf[0]);
if (!cm)
{
- Log() << "Receeved unknown mode prefix " << buf[0] << " in FJOIN string";
+ Log() << "Received unknown mode prefix " << buf[0] << " in FJOIN string";
buf.erase(buf.begin());
continue;
}
diff --git a/src/main.cpp b/src/main.cpp
index a33f1dff4..c3b606246 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -129,10 +129,6 @@ class UplinkSocket : public ConnectionSocket
/* Don't use quitmsg here, it may contain information you don't want people to see */
ircdproto->SendQuit(bi, "Shutting down");
- /* Erase bots from the user list so they don't get nuked later on */
- UserListByNick.erase(bi->nick);
- if (!bi->GetUID().empty())
- UserListByUID.erase(bi->GetUID());
}
/* Clear all of our users, but not our bots */