Merge pull request #302 from edk0/sasl-usercloak

[solanum.git] / extensions / override.c

diff --git a/extensions/override.c b/extensions/override.c
index 312318b24634b5f619adf243a5a808794d5a9a57..20110a65aa06e373f01c72d552cb8a8759adb812 100644 (file)
--- a/extensions/override.c
+++ b/extensions/override.c
@@ -98,7 +98,7 @@ expire_override_deadlines(void *unused)
                        break;
                else if (session_p->deadline < rb_current_time())
                {
-                       const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL};
+                       const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL};
                        user_mode(session_p->client, session_p->client, 3, parv);
                }
        }
@@ -108,6 +108,7 @@ static void
 check_umode_change(void *vdata)
 {
        hook_data_umode_changed *data = (hook_data_umode_changed *)vdata;
+       bool changed = false;
        struct Client *source_p = data->client;
 
        if (!MyClient(source_p))
@@ -116,9 +117,7 @@ check_umode_change(void *vdata)
        if (data->oldumodes & UMODE_OPER && !IsOper(source_p))
                source_p->umodes &= ~user_modes['p'];
 
-       /* didn't change +p umode, we don't need to do anything */
-       if (!((data->oldumodes ^ source_p->umodes) & user_modes['p']))
-               return;
+       changed = ((data->oldumodes ^ source_p->umodes) & user_modes['p']);
 
        if (source_p->umodes & user_modes['p'])
        {
@@ -129,12 +128,12 @@ check_umode_change(void *vdata)
                        return;
                }
 
-               update_session_deadline(source_p, NULL);
-
-               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has enabled oper-override (+p)",
-                                      get_oper_name(source_p));
+               if (changed)
+               {
+                       update_session_deadline(source_p, NULL);
+               }
        }
-       else if (!(source_p->umodes & user_modes['p']))
+       else if (changed && !(source_p->umodes & user_modes['p']))
        {
                rb_dlink_node *n, *tn;
 
@@ -145,9 +144,6 @@ check_umode_change(void *vdata)
                        if (session_p->client != source_p)
                                continue;
 
-                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has disabled oper-override (+p)",
-                                              get_oper_name(session_p->client));
-
                        rb_dlinkDelete(n, &overriding_opers);
                        rb_free(session_p);
                }
@@ -261,11 +257,20 @@ struct ev_entry *expire_override_deadlines_ev = NULL;
 static int
 _modinit(void)
 {
+       rb_dlink_node *ptr;
+
        /* add the usermode to the available slot */
        user_modes['p'] = find_umode_slot();
        construct_umodebuf();
 
-        expire_override_deadlines_ev = rb_event_add("expire_override_deadlines", expire_override_deadlines, NULL, 60);
+       RB_DLINK_FOREACH(ptr, lclient_list.head)
+       {
+               struct Client *client_p = ptr->data;
+               if (IsPerson(client_p) && (client_p->umodes & user_modes['p']))
+                       update_session_deadline(client_p, NULL);
+       }
+
+       expire_override_deadlines_ev = rb_event_add("expire_override_deadlines", expire_override_deadlines, NULL, 60);
 
        return 0;
 }
@@ -273,10 +278,18 @@ _modinit(void)
 static void
 _moddeinit(void)
 {
+       rb_dlink_node *n, *tn;
+
        /* disable the umode and remove it from the available list */
        user_modes['p'] = 0;
        construct_umodebuf();
 
+       RB_DLINK_FOREACH_SAFE(n, tn, overriding_opers.head)
+       {
+               rb_dlinkDelete(n, &overriding_opers);
+               rb_free(n->data);
+       }
+
        rb_event_delete(expire_override_deadlines_ev);
 }