From 507069a11049061d3337133ce1fd42213e30e336 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Sun, 1 May 2005 17:16:58 +0000 Subject: [PATCH] Fix en_GB language name, fix NickServ mergedb command. 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. git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-20 --- ChangeLog | 40 ++++++++++++++++++++++++ FAQ | 11 ++++--- languages/{en_UK => en_GB}/README | 0 languages/{en_UK => en_GB}/chanserv.help | 0 languages/{en_UK => en_GB}/opserv.help | 0 languages/{en_UK => en_GB}/strings.db | 0 src/nickserv.c | 5 +++ 7 files changed, 51 insertions(+), 5 deletions(-) rename languages/{en_UK => en_GB}/README (100%) rename languages/{en_UK => en_GB}/chanserv.help (100%) rename languages/{en_UK => en_GB}/opserv.help (100%) rename languages/{en_UK => en_GB}/strings.db (100%) diff --git a/ChangeLog b/ChangeLog index 570c42a..6b32bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,46 @@ # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3 # +2005-05-01 17:16:58 GMT Michael Poole 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 patch-19 Summary: diff --git a/FAQ b/FAQ index 1041fc7..bd55116 100644 --- a/FAQ +++ b/FAQ @@ -52,8 +52,9 @@ module; for example, "./configure --enable-modules=memoserv". Then 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.) diff --git a/languages/en_UK/README b/languages/en_GB/README similarity index 100% rename from languages/en_UK/README rename to languages/en_GB/README diff --git a/languages/en_UK/chanserv.help b/languages/en_GB/chanserv.help similarity index 100% rename from languages/en_UK/chanserv.help rename to languages/en_GB/chanserv.help diff --git a/languages/en_UK/opserv.help b/languages/en_GB/opserv.help similarity index 100% rename from languages/en_UK/opserv.help rename to languages/en_GB/opserv.help diff --git a/languages/en_UK/strings.db b/languages/en_GB/strings.db similarity index 100% rename from languages/en_UK/strings.db rename to languages/en_GB/strings.db diff --git a/src/nickserv.c b/src/nickserv.c index 0ea7636..0a05aaf 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -3215,6 +3215,7 @@ nickserv_db_read_handle(const char *handle, dict_t obj) 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 @@ nickserv_db_read_handle(const char *handle, dict_t obj) } 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 @@ nickserv_db_read_handle(const char *handle, dict_t obj) 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); -- 2.20.1