Merge pull request #302 from edk0/sasl-usercloak

[solanum.git] / extensions / extb_oper.c

diff --git a/extensions/extb_oper.c b/extensions/extb_oper.c
index 083b587b9433139ebe6e0a6777ed66dc0b7071d2..0400e724ca3a8e8644948bd02a49a24f143ae0b8 100644 (file)
--- a/extensions/extb_oper.c
+++ b/extensions/extb_oper.c
@@ -1,8 +1,6 @@
 /*
  * Oper extban type: matches opers
  * -- jilles
- *
- * $Id: extb_oper.c 1299 2006-05-11 15:43:03Z jilles $
  */
 
 #include "stdinc.h"
@@ -12,11 +10,13 @@
 #include "s_newconf.h"
 #include "ircd.h"
 
+static const char extb_desc[] = "Oper ($o) extban type";
+
 static int _modinit(void);
 static void _moddeinit(void);
 static int eb_oper(const char *data, struct Client *client_p, struct Channel *chptr, long mode_type);
 
-DECLARE_MODULE_AV1(extb_oper, _modinit, _moddeinit, NULL, NULL, NULL, "$Revision: 1299 $");
+DECLARE_MODULE_AV2(extb_oper, _modinit, _moddeinit, NULL, NULL, NULL, NULL, NULL, extb_desc);
 
 static int
 _modinit(void)
@@ -40,8 +40,14 @@ static int eb_oper(const char *data, struct Client *client_p,
        (void)mode_type;
 
        if (data != NULL)
-               return IsOper(client_p) ? EXTBAN_MATCH : EXTBAN_NOMATCH;
+       {
+               struct PrivilegeSet *set = privilegeset_get(data);
+               if (set != NULL && client_p->user->privset == set)
+                       return EXTBAN_MATCH;
+
+               /* $o:admin or whatever */
+               return HasPrivilege(client_p, data) ? EXTBAN_MATCH : EXTBAN_NOMATCH;
+       }
 
-       /* $o:admin or whatever */
-       return HasPrivilege(client_p, data) ? EXTBAN_MATCH : EXTBAN_NOMATCH;
+       return IsOper(client_p) ? EXTBAN_MATCH : EXTBAN_NOMATCH;
 }