diff options
| author | Adam <Adam@anope.org> | 2010-09-11 16:52:08 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-09-11 16:52:08 -0400 |
| commit | 9a488327b200f3be4efd20a084b674177714e962 (patch) | |
| tree | fd540b5393f0dfbb93d68a133c11016208beb49e | |
| parent | f302367fc4db0aeacd596e0df9b91a6ea0d61871 (diff) | |
Fixed db-merger handling some hostserv collisions
| -rw-r--r-- | src/tools/db-merger.c | 16 | ||||
| -rw-r--r-- | version.log | 3 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c index 77b4c2e8a..5a128cc18 100644 --- a/src/tools/db-merger.c +++ b/src/tools/db-merger.c @@ -1570,20 +1570,16 @@ int main(int argc, char *argv[]) } if (input[0] == '2') { /* free() hcptr and get it out of the list, put hc into the list */ printf("Deleting vHost %s (vIdent: %s) for nick %s (#1).\n", hcptr->vHost, (hcptr->vIdent) ? hcptr->vIdent : "none", hcptr->nick); - if (hcptr->last) - hcptr->last->next = hcptr->next; - if (hcptr->next) - hcptr->next->last = hcptr->last; free(hcptr->nick); + hcptr->nick = hc->nick; free(hcptr->vHost); + hcptr->vHost = hc->vHost; free(hcptr->vIdent); + hcptr->vIdent = hc->vIdent; free(hcptr->creator); - free(hcptr); - hc->next = firsthc; - if (firsthc) - firsthc->last = hc; - hc->last = NULL; - firsthc = hc; + hcptr->creator = hc->creator; + hcptr->time = hc->time; + free(hc); } else if (input[0] == '1') { /* free() hc */ printf("Deleting vHost %s (vIdent: %s) for nick %s (#2).\n", hc->vHost, (hc->vIdent) ? hc->vIdent : "none", hc->nick); free(hc->nick); diff --git a/version.log b/version.log index 4071bc1d7..f149342d2 100644 --- a/version.log +++ b/version.log @@ -8,9 +8,10 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="5" VERSION_EXTRA="-git" -VERSION_BUILD="3038" +VERSION_BUILD="3039" # $Log$ # Changes since 1.8.5 Release +#Revision 3039 - Fixed db-merger handling some hostserv collisions #Revision 3038 - Initialise git for 1.8-git |