summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-07-15 14:56:38 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-07-15 14:56:38 +0000
commit7fffea77edbe72cd66f7a55f41a3966204f9cf86 (patch)
tree6951189442fcf4dcba2a0ec26d9654fecc93c4f7
parent8ce96b1724a208e2ab3162a4d3ed095b5758b996 (diff)
BUILD : 1.7.4 (262) BUGS : 125 NOTES : Fixed the /ns release issue with UseSVSHOLD
git-svn-id: svn://svn.anope.org/anope/trunk@262 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@168 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes1
-rw-r--r--nickserv.c4
-rw-r--r--version.log6
3 files changed, 9 insertions, 2 deletions
diff --git a/Changes b/Changes
index 38828939a..377d22216 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Anope Version S V N
Provided by Anope Dev. <dev@anope.org> - 2004
07/05 A Warning when LocalAddress conflicts with RemoteServer. [#118]
06/18 A Added proper Bahamut1.8 support. [ #55]
+07/15 F Fixed the bug where /ns release didn't work with UseSVSHOLD. [#125]
07/15 F Fixed a tiny memleak in the db routine [ #00]
07/15 F Updated Dutch language file. [ #00]
07/14 F Added CHECK to the memoserv help menu. [ #00]
diff --git a/nickserv.c b/nickserv.c
index 5916d319f..ec10e4fe0 100644
--- a/nickserv.c
+++ b/nickserv.c
@@ -1125,9 +1125,11 @@ void cancel_user(User * u)
#ifdef HAS_SVSHOLD
}
#endif
+ na->status &= ~NS_TEMPORARY;
na->status |= NS_KILL_HELD;
+ } else {
+ na->status &= ~NS_TEMPORARY;
}
- na->status &= ~NS_TEMPORARY;
del_ns_timeout(na, TO_COLLIDE);
}
diff --git a/version.log b/version.log
index 3f818d69d..e717ee016 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="4"
-VERSION_BUILD="261"
+VERSION_BUILD="262"
# $Log$
#
+# BUILD : 1.7.4 (262)
+# BUGS : 125
+# NOTES : Fixed the /ns release issue with UseSVSHOLD
+#
# BUILD : 1.7.4 (261)
# BUGS :
# NOTES : fixed a tiny memleak in the db routine