[srvx-commits] commit: Fix en_GB language name, fix NickServ mergedb command.

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

Revision: srvx--devo--1.3--patch-20
Archive: sr...@sr...--2005-srvx
Creator: Michael Poole <md...@tr...>
Date: Sun May  1 13:16:58 EDT 2005
Standard-date: 2005-05-01 17:16:58 GMT
New-directories: languages/en_GB/.arch-ids
Removed-directories: languages/en_UK/.arch-ids
Renamed-files: languages/en_UK/.arch-ids/=id languages/en_GB/.arch-ids/=id
    languages/en_UK/.arch-ids/README.id languages/en_GB/.arch-ids/README.id
    languages/en_UK/.arch-ids/chanserv.help.id languages/en_GB/.arch-ids/chanserv.help.id
    languages/en_UK/.arch-ids/opserv.help.id languages/en_GB/.arch-ids/opserv.help.id
    languages/en_UK/.arch-ids/strings.db.id languages/en_GB/.arch-ids/strings.db.id
Renamed-directories: languages/en_UK languages/en_GB
Modified-files: ChangeLog FAQ src/nickserv.c
New-patches: sr...@sr...--2005-srvx/srvx--devo--1.3--patch-20
Summary: Fix en_GB language name, fix NickServ mergedb command.
Keywords: 

FAQ: Clarify FAQ #8.

src/nickserv.c: Avoid losing channel information when replacing an
account using the mergedb command.

languages/en_UK: Rename to en_GB.

* removed directories

    languages/en_UK/.arch-ids

* added directories

    languages/en_GB/.arch-ids

* added files

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

* renamed files and symlinks

    languages/en_UK/.arch-ids/=id
     => languages/en_GB/.arch-ids/=id

    languages/en_UK/.arch-ids/README.id
     => languages/en_GB/.arch-ids/README.id

    languages/en_UK/.arch-ids/chanserv.help.id
     => languages/en_GB/.arch-ids/chanserv.help.id

    languages/en_UK/.arch-ids/opserv.help.id
     => languages/en_GB/.arch-ids/opserv.help.id

    languages/en_UK/.arch-ids/strings.db.id
     => languages/en_GB/.arch-ids/strings.db.id

* renamed directories

    languages/en_UK
     => languages/en_GB

* modified files

--- orig/ChangeLog
+++ mod/ChangeLog
@@ -2,6 +2,46 @@
 # arch-tag: aut...@sr...--2005-srvx/srvx--devo--1.3
 #
 
+2005-05-01 17:16:58 GMT	Michael Poole <md...@tr...>	patch-20
+
+    Summary:
+      Fix en_GB language name, fix NickServ mergedb command.
+    Revision:
+      srvx--devo--1.3--patch-20
+
+    FAQ: Clarify FAQ #8.
+    
+    src/nickserv.c: Avoid losing channel information when replacing an
+    account using the mergedb command.
+    
+    languages/en_UK: Rename to en_GB.
+
+    modified files:
+     ChangeLog FAQ src/nickserv.c
+
+    renamed files:
+     languages/en_UK/.arch-ids/=id
+       ==> languages/en_GB/.arch-ids/=id
+     languages/en_UK/.arch-ids/README.id
+       ==> languages/en_GB/.arch-ids/README.id
+     languages/en_UK/.arch-ids/chanserv.help.id
+       ==> languages/en_GB/.arch-ids/chanserv.help.id
+     languages/en_UK/.arch-ids/opserv.help.id
+       ==> languages/en_GB/.arch-ids/opserv.help.id
+     languages/en_UK/.arch-ids/strings.db.id
+       ==> languages/en_GB/.arch-ids/strings.db.id
+
+    new directories:
+     languages/en_GB/.arch-ids
+
+    removed directories:
+     languages/en_UK/.arch-ids
+
+    renamed directories:
+     languages/en_UK
+       ==> languages/en_GB
+
+
 2005-03-15 23:12:58 GMT	Michael Poole <md...@tr...>	patch-19
 
     Summary:


--- orig/FAQ
+++ mod/FAQ
@@ -52,8 +52,9 @@
 see the comment near the start of src/mod-memoserv.c for configuration
 options.
 
-Q8) How do I enable both HelpServ and MemoServ?  In addition to the
-configuration steps above, you must mention both when you run the
-configure script.  For example, run it using "./configure
---enable-modules=memoserv,helpserv".  (You may add the snoop and/or
-sockcheck modules as well; separate the module names with commas.)
+Q8) How do I enable both HelpServ and MemoServ?
+A8) In addition to the post-install configuration steps above, you
+must mention both when you run the configure script.  For example, run
+it using "./configure --enable-modules=memoserv,helpserv".  (You may
+add the snoop and/or sockcheck modules as well; separate the module
+names with commas.)


--- orig/src/nickserv.c
+++ mod/src/nickserv.c
@@ -3215,6 +3215,7 @@
     struct string_list *masks, *slist;
     struct handle_info *hi;
     struct userNode *authed_users;
+    struct userData *channels;
     unsigned long int id;
     unsigned int ii;
     dict_t subdb;
@@ -3228,10 +3229,13 @@
     }
     if ((hi = get_handle_info(handle))) {
         authed_users = hi->users;
+        channels = hi->channels;
         hi->users = NULL;
+        hi->channels = NULL;
         dict_remove(nickserv_handle_dict, hi->handle);
     } else {
         authed_users = NULL;
+        channels = NULL;
     }
     hi = register_handle(handle, str, id);
     if (authed_users) {
@@ -3241,6 +3245,7 @@
             authed_users = authed_users->next_authed;
         }
     }
+    hi->channels = channels;
     masks = database_get_data(obj, KEY_MASKS, RECDB_STRING_LIST);
     hi->masks = masks ? string_list_copy(masks) : alloc_string_list(1);
     str = database_get_data(obj, KEY_MAXLOGINS, RECDB_QSTRING);