summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-04-29 00:23:06 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2010-04-29 00:23:06 +0000
commit40c9226e3ab8ba9f7d2bad898961989f6905aca0 (patch)
tree1df486f31090bc724350bb5204ac2fa3b5965d6f
parente897082f69b1337705eb0e6c35d9dbe12d2c4d19 (diff)
Fixed deleting nick requests to only delete the requested nick
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2918 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--src/nickserv.c8
-rw-r--r--version.log3
3 files changed, 10 insertions, 2 deletions
diff --git a/Changes b/Changes
index 9ef6b510a..d3bcfcd81 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ Anope Version 1.8 - SVN
4/15 F Fixed a potential crash in cs_clear ops [#1154]
4/16 F Fixed missing TS6SID on FJOIN in inspircd12 [ #00]
4/19 F Fixed ns_info to show nick expire times to opers not only admins [ #00]
+4/28 F Fixed a bug that could make some nick requests disappear [ #00]
Anope Version 1.8.4
-------------------
diff --git a/src/nickserv.c b/src/nickserv.c
index 484ebeed0..8b15d9920 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1539,7 +1539,13 @@ static int delcore(NickCore * nc)
int delnickrequest(NickRequest * nr)
{
if (nr) {
- nrlists[HASH(nr->nick)] = nr->next;
+ if (nr->next)
+ nr->next->prev = nr->prev;
+ if (nr->prev)
+ nr->prev->next = nr->next;
+ else
+ nrlists[HASH(nr->nick)] = nr->next;
+
if (nr->nick)
free(nr->nick);
if (nr->passcode)
diff --git a/version.log b/version.log
index 666fc09e0..d818aefd4 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="4"
VERSION_EXTRA="-svn"
-VERSION_BUILD="2903"
+VERSION_BUILD="2918"
# $Log$ # Changes since the 1.8.4 Release
+#Revision 2918 - Fixed deleting nick requests to only delete the requested nick
#Revision 2903 - Removed some unnecessary redundant code in cs_clear
#Revision 2900 - Fixed /ns info to show when a nick expires to services opers, not only admins
#Revision 2899 - Fixed missing SID on FJOIN in InspIRCd12 protocol module