summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2018-04-15 22:37:04 +0100
committerPeter Powell <petpow@saberuk.com>2018-04-16 09:47:26 +0100
commit233c624056ade467c7b4b4dbebbf62628f00cc28 (patch)
tree1af4dd4f016cf1e8782572314a4bfac08d5dc233 /src
parent5d3b128ca2a63d7c04b51f58c0e9c390255a9365 (diff)
Use an oper priv instead of a config flag for overriding callerid.
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_callerid.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index d69f5606f..f43dd448d 100644
--- 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);
}