diff options
author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-23 17:05:52 +0000 |
---|---|---|
committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-03-23 17:05:52 +0000 |
commit | 8f3958d0f43bb884f3b51681857349ccf48b8b34 (patch) | |
tree | f44d8a7e715ea9eacf936d01a5d697b0373b22a8 | |
parent | 57fb28e70a2096fcf7cb1ab5838de3ac19e4b56b (diff) |
Correct backport of bug #1065, patch from DukePyrolator, there is no nc on the User struct in 1.8.x, use nickTrack instead, oops.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2199 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r-- | src/core/ns_suspend.c | 8 | ||||
-rw-r--r-- | version.log | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index 6ca8eba6c..8baaec865 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -117,8 +117,12 @@ int do_suspend(User * u) na2->status &= ~(NS_IDENTIFIED | NS_RECOGNIZED); na2->last_quit = sstrdup(reason); /* remove nicktracking */ - if ((u2 = finduser(na2->nick))) - u2->nc = NULL; + if ((u2 = finduser(na2->nick))) { + if (u2->nickTrack) { + free(u2->nickTrack); + u2->nickTrack = NULL; + } + } /* force guestnick */ collide(na2, 0); } diff --git a/version.log b/version.log index 55f88dcbc..0ef27c6f5 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,11 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="0" VERSION_EXTRA="-svn" -VERSION_BUILD="2196" +VERSION_BUILD="2199" # $Log$ # Changes since 1.8.0 Release +#Revision 2199 - Correct backport of bug #1064, patch from DukePyrolator, there is no nc on the User struct in 1.8.x, use nickTrack instead, oops. #Revision 2196 - Backport of bugfix for bug #1044 from SVN r2195, CS SET MLOCK no longer requires a parameter, and leaving out the parameter renders the mlock to +r as it should be. #Revision 2193 - Backport of bugfix for bug #1065 from SVN r2192, original patch from DukePyrolator, force a user off a nick when it is suspended. #Revision 2189 - Backport of bugfix for bug #1064 from SVN r2188, original patch from DukePyrolator, fixes NS RECOVER so it doesn't display "(null)" in some places. |