[srvx-commits] commit: Mention 'slab' in --with-malloc docs. Merge fakehosts when merging accounts.

[Michael P. <md...@tr...>]

Revision: srvx--devo--1.3--patch-17
Archive: sr...@sr...--2005-srvx
Creator: Michael Poole <md...@tr...>
Date: Thu Feb 10 22:10:49 EST 2005
Standard-date: 2005-02-11 03:10:49 GMT
Modified-files: ChangeLog configure.in src/nickserv.c
New-patches: sr...@sr...--2005-srvx/srvx--devo--1.3--patch-17
Summary: Mention 'slab' in --with-malloc docs.  Merge fakehosts when merging accounts.
Keywords: 

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

src/nickserv.c (cmd_merge): Copy fakehost to target account if appropriate.

* added files

    {arch}/srvx/srvx--devo/srvx--devo--1.3/sr...@sr...--2005-srvx/patch-log/patch-17

* modified files

--- orig/ChangeLog
+++ mod/ChangeLog
@@ -2,6 +2,21 @@
 # arch-tag: aut...@sr...--2005-srvx/srvx--devo--1.3
 #
 
+2005-02-11 03:10:49 GMT	Michael Poole <md...@tr...>	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 <md...@tr...>	patch-16
 
     Summary:


--- orig/configure.in
+++ mod/configure.in
@@ -152,7 +152,7 @@
 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


--- orig/src/nickserv.c
+++ mod/src/nickserv.c
@@ -2860,6 +2860,13 @@
     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);