* Port [3211] to 1.2.14

 * Delay 'op-requests'.time seconds before re-requesting op on opeless channels.


svn: 3212

doc/UPDATES

@@ -12,6 +12,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fix cmd_swhois stripping multiple channel modes. (fixes #348)
 * Fix processing/killing/signalling of possible new localhub when editing binary.
 * The socket file generated for restarting is now encrypted.
+* Delay 'op-requests'.time seconds before re-requesting op on opeless channels.
 
 1.2.13 - http://wraith.shatow.net/milestone/1.2.13
 * Fix cmd_chanset accepting invalid flags

src/mod/irc.mod/irc.c

@@ -674,8 +674,8 @@ request_op(struct chanset_t *chan)
   }
   if (!i) {
     if (channel_active(chan) && !channel_pending(chan)) {
-      chan->channel.no_op = now + 5;
-      putlog(LOG_GETIN, "*", "No one to ask for ops on %s - Delaying requests for 5 seconds.", chan->dname);
+      chan->channel.no_op = now + op_requests.time;
+      putlog(LOG_GETIN, "*", "No one to ask for ops on %s - Delaying requests for %d seconds.", chan->dname, op_requests.time);
     }
     return;
   }