Mention 'slab' in --with-malloc docs. Merge fakehosts when merging accounts.

configure.in (--with-malloc): Mention the awesome 'slab' allocator option.

src/nickserv.c (cmd_merge): Copy fakehost to target account if appropriate.
git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-17

diff --git a/ChangeLog b/ChangeLog
index 24339ece9862d320937912270d2f13b1d55c4e3e..955aa10971d7a1ae95abbfada532abf33c3368c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,21 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3
 #
 
+2005-02-11 03:10:49 GMT        Michael Poole <mdpoole@troilus.org>     patch-17
+
+    Summary:
+      Mention 'slab' in --with-malloc docs.  Merge fakehosts when merging accounts.
+    Revision:
+      srvx--devo--1.3--patch-17
+
+    configure.in (--with-malloc): Mention the awesome 'slab' allocator option.
+    
+    src/nickserv.c (cmd_merge): Copy fakehost to target account if appropriate.
+
+    modified files:
+     ChangeLog configure.in src/nickserv.c
+
+
 2005-02-08 04:42:43 GMT        Michael Poole <mdpoole@troilus.org>     patch-16
 
     Summary:

diff --git a/configure.in b/configure.in
index 3df600bf3404a8692c53e8e00860c888c3828b9f..3fe7fa03a4c098dcf33bf19e9ba324edb7fe8014 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -152,7 +152,7 @@ dnl Optional features.
 AC_MSG_CHECKING(which malloc to use)
 AC_ARG_WITH(malloc,
 [  --with-malloc=type      Enables use of a special malloc library; one of:
-                          system (the default), boehm-gc, dmalloc, mpatrol, srvx],
+                          system (the default), boehm-gc, dmalloc, mpatrol, srvx, slab],
 [],
 [withval="system"])
 if test "x$withval" = "xsystem" ; then

diff --git a/src/nickserv.c b/src/nickserv.c
index d11c80ad15f2631a334da0fab3080cddf390141e..0ea763633b7adb2477fac915a983b8470355bf07 100644 (file)
--- 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);