X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fnickserv.c;h=0ea763633b7adb2477fac915a983b8470355bf07;hb=1e7c24b3150ef9ebfe2684b2cdf75c689a8328c5;hp=d11c80ad15f2631a334da0fab3080cddf390141e;hpb=da71e7473ce7a454170d3030f2edcd1c1b1e04d4;p=srvx.git

diff --git a/src/nickserv.c b/src/nickserv.c
index d11c80a..0ea7636 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -2860,6 +2860,13 @@ static NICKSERV_FUNC(cmd_merge)
     if (hi_from->lastseen > hi_to->lastseen)
         hi_to->lastseen = hi_from->lastseen;
 
+    /* Does a fakehost carry over?  (This intentionally doesn't set it
+     * for users previously attached to hi_to.  They'll just have to
+     * reconnect.)
+     */
+    if (hi_from->fakehost && !hi_to->fakehost)
+        hi_to->fakehost = strdup(hi_from->fakehost);
+
     /* Notify of success. */
     sprintf(buffer, "%s (%s) merged account %s into %s.", user->nick, user->handle_info->handle, hi_from->handle, hi_to->handle);
     reply("NSMSG_HANDLES_MERGED", hi_from->handle, hi_to->handle);