* Port [3201] to 1.2.14

 * Fix more bot flag issues (fixes #344)


svn: 3202

doc/UPDATES

@@ -4,7 +4,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 
 1.2.14 - http://wraith.shatow.net/milestone/1.2.14
 * Fix another bug in shell functions. (fixes #321)
-* Fix some bugs with bot flags. (fixes #334 and #337)
+* Fix some bugs with bot flags. (fixes #334 and #337 and #344)
 * Remove the notes system and related commands. (fixes #275)
 * Fix ./binary -C not signalling the correct process under some situations. (actually fixes #315)
 * Fix bots being removed from binary not being killed. (fixes #338)

src/flags.c

@@ -525,7 +525,7 @@ doresolv(struct chanset_t *chan)
   if (!chan)
     return 0;
 
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_BOT, 0, 0, 0 };
 
   get_user_flagrec(conf.bot->u, &fr, chan->dname);
   if (glob_doresolv(fr) || chan_doresolv(fr))
@@ -539,7 +539,7 @@ dovoice(struct chanset_t *chan)
   if (!chan)
     return 0;
 
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_BOT, 0, 0, 0 };
 
   get_user_flagrec(conf.bot->u, &fr, chan->dname);
   if (glob_dovoice(fr) || chan_dovoice(fr))
@@ -553,7 +553,7 @@ dolimit(struct chanset_t *chan)
   if (!chan)
     return 0;
 
-  struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+  struct flag_record fr = { FR_GLOBAL | FR_CHAN | FR_BOT, 0, 0, 0 };
 
   get_user_flagrec(conf.bot->u, &fr, chan->dname);
   if (glob_dolimit(fr) || chan_dolimit(fr))

src/mod/irc.mod/irc.c

@@ -624,7 +624,7 @@ request_op(struct chanset_t *chan)
 
   int i = 0, my_exp = 0, first = 100;
   time_t n = now;
-  struct flag_record myfr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+  struct flag_record myfr = { FR_GLOBAL | FR_CHAN | FR_BOT, 0, 0, 0 };
 
   get_user_flagrec(conf.bot->u, &myfr, chan->dname);
 
@@ -732,7 +732,7 @@ request_op(struct chanset_t *chan)
 static void
 request_in(struct chanset_t *chan)
 {
-  struct flag_record myfr = { FR_GLOBAL | FR_CHAN, 0, 0, 0 };
+  struct flag_record myfr = { FR_GLOBAL | FR_CHAN | FR_BOT, 0, 0, 0 };
 
   get_user_flagrec(conf.bot->u, &myfr, NULL);