* Only auto-op a user if they have a password set. (#52)

* Add 'rem' 'del' 'remove' 'delete' for removing a bot via cmd_conf


svn: 2068

doc/UPDATES

@@ -20,7 +20,6 @@ Lines prefixxed with '-' were disabled before release and are not finishsed, or
 * Fixed binary getting an excess of 1-15 bytes during write. 
 * Binary writing is now a bit faster as the hash is calculated on the fly now.
 * If a binary is already initialized when updating, the pack data will not be overwritten.
-* cmd_conf (delbot) now also removes the bot from the userfile
 * cmd_mns_user cosmetic change
 * Added cmdline option '-r <botname>' for restarting/starting specified bot.
 * Typos in help for 'info'
@@ -78,12 +77,10 @@ Lines prefixxed with '-' were disabled before release and are not finishsed, or
 * Fixed unsetting a global ban when the same ban is local to a chan causes the bots to unban it. (#24)
 * +O now implies +o
 * Combined kick reasons for +k and .kickban
-* Fixed cmd_conf not correctly writing settings back to the binary
 * Some automatic things done after editing the binary with -C are:
   -New bots are spawned and added (if linked)
   -Changed (NEW) ip/host for bots are added to the botnet (if linked)
   -Removed bots are killed and removed from the userlist (if linked)
-* Added options 'enable' and 'disable' to cmd_conf for bots
 * Fixed dccauth not correctly working according to it's [bot]config setting (#30)
 * Added match option for cmd_botcmd: '&' will match on all localhubs (first bot in config) (#28)
 * Added some debug logging when a telnet connection is ignored.
@@ -105,6 +102,13 @@ Lines prefixxed with '-' were disabled before release and are not finishsed, or
 * Added log msg (+w) for when a msg is received when umode +g. (#44)
 * cmd_botcmd now works correctly when the target is the bot you're on. (#46)
 * cmd_pls_user wasn't correctly sharing multiple hosts to the botnet. (#48)
+* cmd_conf changes:
+  -Added 'enable' and 'disable' for bots
+  -'remove', 'rem', 'delete' are now also recognized for 'del'
+  -Fixed the binary not correctly being rewritten/saved
+  -Bots are now correctly killed/spawned 
+  -'del' now also removes the bot from the userlist
+* Only auto-op a user if they have a password set. (#52)
 
 1.2.2
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.

src/cmds.c

@@ -1753,7 +1753,7 @@ static void cmd_conf(int idx, char *par)
       dprintf(idx, "Changed bot: %s\n", nick);
     listbot = strdup(nick);
     save++;
-  } else if (!egg_strcasecmp(cmd, "del")) {
+  } else if (!egg_strncasecmp(cmd, "del", 3) || !egg_strncasecmp(cmd, "rem", 3)) {
     if (!par[0]) {
       dprintf(idx, "Usage: conf del <bot>\n");
       return;

src/mod/irc.mod/chan.c

@@ -950,7 +950,7 @@ static void check_this_member(struct chanset_t *chan, char *nick, struct flag_re
          (!loading && userlist && chan_bitch(chan) && !chk_op(*fr, chan)) ) ) {
       /* if (target_priority(chan, m, 1)) */
         add_mode(chan, '-', 'o', m->nick);
-    } else if (!chan_hasop(m) && dovoice(chan) && chk_autoop(*fr, chan)) {
+    } else if (!chan_hasop(m) && dovoice(chan) && m->user && !u_pass_match(m->user, "-") && chk_autoop(*fr, chan)) {
       do_op(m->nick, chan, 1, 0);
     }
     if (dovoice(chan)) {