Add .travis.yml

[solanum.git] / extensions / override.c

diff --git a/extensions/override.c b/extensions/override.c
index 90524c62087b27ceb1026d0402cf3e745276f3d0..cd40ebeeee42f362b477c74dc0820232b0c9a47e 100644 (file)
--- a/extensions/override.c
+++ b/extensions/override.c
@@ -25,6 +25,7 @@
 static void check_umode_change(void *data);
 static void hack_channel_access(void *data);
 static void hack_can_join(void *data);
+static void hack_can_kick(void *data);
 static void hack_can_send(void *data);
 static void handle_client_exit(void *data);
 
@@ -32,11 +33,13 @@ mapi_hfn_list_av1 override_hfnlist[] = {
        { "umode_changed", (hookfn) check_umode_change },
        { "get_channel_access", (hookfn) hack_channel_access },
        { "can_join", (hookfn) hack_can_join },
+       { "can_kick", (hookfn) hack_can_kick },
        { "can_send", (hookfn) hack_can_send },
        { "client_exit", (hookfn) handle_client_exit },
        { NULL, NULL }
 };
 
+#define CHFL_OVERRIDE          0x0004
 #define IsOperOverride(x)      (HasPrivilege((x), "oper:override"))
 
 struct OverrideSession {
@@ -153,16 +156,21 @@ hack_channel_access(void *vdata)
 {
        hook_data_channel_approval *data = (hook_data_channel_approval *) vdata;
 
+       if (data->dir == MODE_QUERY)
+               return;
+
        if (data->approved == CHFL_CHANOP)
                return;
 
        if (data->client->umodes & user_modes['p'])
        {
                update_session_deadline(data->client, NULL);
-               data->approved = CHFL_CHANOP;
+               data->approved = CHFL_OVERRIDE;
 
-               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (modehacking)",
-                                      get_oper_name(data->client), data->chptr->chname);
+               /* we only want to report modehacks, which are always non-NULL */
+               if (data->modestr)
+                       sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (modehacking: %s)",
+                                              get_oper_name(data->client), data->chptr->chname, data->modestr);
        }
 }
 
@@ -184,11 +192,32 @@ hack_can_join(void *vdata)
        }
 }
 
+static void
+hack_can_kick(void *vdata)
+{
+       hook_data_channel_approval *data = (hook_data_channel_approval *) vdata;
+       int alevel;
+
+       alevel = get_channel_access(data->client, data->chptr, data->msptr, data->dir, NULL);
+       if (alevel != CHFL_OVERRIDE)
+               return;
+
+       if (data->client->umodes & user_modes['p'])
+       {
+               update_session_deadline(data->client, NULL);
+               sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (KICK %s)",
+                                      get_oper_name(data->client), data->chptr->chname, data->target->name);
+       }
+}
+
 static void
 hack_can_send(void *vdata)
 {
        hook_data_channel_approval *data = (hook_data_channel_approval *) vdata;
 
+       if (data->dir == MODE_QUERY)
+               return;
+
        if (data->approved == CAN_SEND_NONOP || data->approved == CAN_SEND_OPV)
                return;