* Port [3003] to 1.2.11

 * Hub bots can no longer being whois'd or match'd from leaf bots.


svn: 3004

doc/UPDATES

@@ -25,6 +25,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fix a segfault with ctcp-cloak. (fairly random) (fixes #285)
 * Fixed cmd_botset not making a bot grab a different capitalization of a nick. (fixes #283)
 * Hub nicks no longer show on leaf bots for partyline chat.
+* Hub bots can no longer being whois'd or match'd from leaf bots.
 
 1.2.10 - http://tracker.shatow.net/milestone/1.2.10
 * Removed old references to '+/-manop' and '+/-nomop' for chaninfo in help file.

src/flags.c

@@ -569,6 +569,10 @@ whois_access(struct userrec *user, struct userrec *whois_user)
   get_user_flagrec(user, &fr, NULL);
   get_user_flagrec(whois_user, &whois, NULL);
 
+  /* Don't show hub bots from leaf bots. */
+  if (!conf.bot->hub && whois_user->bot && bot_hublevel(whois_user) < 999)
+    return 0;
+
   if (
       (isowner(whois_user->handle) && !isowner(user->handle)) ||
       (glob_admin(whois) && !glob_admin(fr)) ||