Use an oper priv instead of a config flag for overriding nonicks.

[user/henk/code/inspircd.git] / src / modules / m_callerid.cpp

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index d69f5606f00c865a9475d7b5daeff1d028b9a21d..f43dd448daa02976e8f3f488fcef8d8ef6528fb2 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -330,7 +330,6 @@ class ModuleCallerID : public Module
        SimpleUserModeHandler myumode;
 
        // Configuration variables:
-       bool operoverride; // Operators can override callerid.
        bool tracknick; // Allow ACCEPT entries to update with nick changes.
        unsigned int notify_cooldown; // Seconds between notifications.
 
@@ -384,7 +383,7 @@ public:
                if (!dest->IsModeSet(myumode) || (user == dest))
                        return MOD_RES_PASSTHRU;
 
-               if (operoverride && user->IsOper())
+               if (user->HasPrivPermission("users/callerid-override"))
                        return MOD_RES_PASSTHRU;
 
                callerid_data* dat = cmd.extInfo.get(dest, true);
@@ -420,7 +419,6 @@ public:
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
                cmd.maxaccepts = tag->getInt("maxaccepts", 16);
-               operoverride = tag->getBool("operoverride");
                tracknick = tag->getBool("tracknick");
                notify_cooldown = tag->getDuration("cooldown", 60);
        }