[X2serv-cvs] [CVS] Module x3: Change committed
Brought to you by:
sirvulcan
From: Alex S. <ru...@us...> - 2005-05-05 03:19:35
|
Committer : Alex Schumann <ru...@us...> CVSROOT : /cvsroot/x2serv Module : x3 Commit time: 2005-05-05 03:19:19 UTC Modified files: ChangeLog.X3 src/nickserv.c Log message: arch sync ---------------------- diff included ---------------------- Index: x3/ChangeLog.X3 diff -u x3/ChangeLog.X3:1.27 x3/ChangeLog.X3:1.28 --- x3/ChangeLog.X3:1.27 Wed May 4 17:14:56 2005 +++ x3/ChangeLog.X3 Wed May 4 20:19:09 2005 @@ -14,7 +14,9 @@ * src/hash.h: adduser pending, and increased maxbans to 128 from 45. - * src/nickserv.c: adduser pending cleanup and activation code + * src/nickserv.c: adduser pending cleanup and activation code, + Arch sync (Avoid losing channel information when + replacing an account using the mergedb command.) * src/proto-p10.c: adduser pending cleanup code @@ -165,5 +167,5 @@ ***********************************************************************/ -#define CVS_VERSION "$Revision: 1.27 $" +#define CVS_VERSION "$Revision: 1.28 $" Index: x3/src/nickserv.c diff -u x3/src/nickserv.c:1.25 x3/src/nickserv.c:1.26 --- x3/src/nickserv.c:1.25 Wed May 4 17:14:56 2005 +++ x3/src/nickserv.c Wed May 4 20:19:09 2005 @@ -3436,6 +3436,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; @@ -3449,10 +3450,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) { @@ -3462,6 +3466,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); ----------------------- End of diff ----------------------- |