Explorar o código

* Fix an automatic hostmask bug (fixes #339)


svn: 3618
Bryan Drewery %!s(int64=18) %!d(string=hai) anos
pai
achega
64b10986a2
Modificáronse 2 ficheiros con 5 adicións e 5 borrados
  1. 1 0
      doc/UPDATES
  2. 4 5
      src/mod/share.mod/share.c

+ 1 - 0
doc/UPDATES

@@ -68,6 +68,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Userfile transfers now use a random filename instead of .share.botnick.users.timestamp
 * Fix ambiguous warning when a bot tries linking after being added with +user (fixes #383)
 * Add set 'irc-autoaway' to be able to disable autoaway feature. (addresses #380)
+* Fix an automatic hostmask bug (fixes #339)
 
 1.2.13 - http://wraith.shatow.net/milestone/1.2.13
 * Fix cmd_chanset accepting invalid flags

+ 4 - 5
src/mod/share.mod/share.c

@@ -988,6 +988,10 @@ share_endstartup(int idx, char *par)
   /* Send to any other sharebots */
   if (conf.bot->hub)
     hook_read_userfile();
+  else {
+    /* Our hostmask may have been updated on connect, but the new userfile may not have it. */
+    check_hostmask();
+  }
 }
 
 static void
@@ -1351,9 +1355,6 @@ finish_share(int idx)
   load_internal_users();
   add_myself_to_userlist();
   
-  /* Our hostmask may have been updated on connect, but the new userfile may not have it. */
-  check_hostmask();
-
   /* Make sure no removed users/bots are still connected. */
   check_stale_dcc_users();
 
@@ -1362,8 +1363,6 @@ finish_share(int idx)
     bot->u = get_user_by_handle(userlist, bot->bot);
 
   if (!conf.bot->hub) {  
-    /* Our hostmask may have been updated on connect, but the new userfile may not have it. */
-    check_hostmask();
     /* copy over any auth users */
     Auth::FillUsers();
   }