fixed coding fails in the last 2 commits

[srvx.git] / src / opserv.h

diff --git a/src/opserv.h b/src/opserv.h
index 0ff315e0f3b40c67cf04296adfc78a83c0a277f1..169f43218b4df1ad1e34265c3bf2e135d72ee0ac 100644 (file)
--- a/src/opserv.h
+++ b/src/opserv.h
@@ -40,11 +40,12 @@
 
 #define DEVNULL_MODES               "abcdefghijklmno"
 
-#define DEVNULL_HAS_PRIV(cl, tok) ((cl)->modes & DEVNULL_##tok)
-#define DEVNULL_SET_PRIV(cl, tok) ((cl)->modes |= DEVNULL_##tok)
-#define DEVNULL_CLEAR_PRIV(cl, tok) ((cl)->modes &= ~DEVNULL_##tok)
+#define DEVNULL_HAS_PRIV(cl, tok) ((cl)->modes & DEVNULL_PRIV_##tok)
+#define DEVNULL_SET_PRIV(cl, tok) ((cl)->modes |= DEVNULL_PRIV_##tok)
+#define DEVNULL_CLEAR_PRIV(cl, tok) ((cl)->modes &= ~DEVNULL_PRIV_##tok)
 
 struct devnull_class {
+    unsigned int id;
     char *name;
     unsigned long modes;
     unsigned long maxchan;
@@ -56,9 +57,10 @@ extern void *devnull_check_priv_func;
 void init_opserv(const char *nick);
 unsigned int gag_create(const char *mask, const char *owner, const char *reason, unsigned long expires);
 int opserv_bad_channel(const char *name);
-int devnull_check_name(const char *name);
 int devnull_user_has_priv(struct handle_info *hi, int devnull_priv);
 struct devnull_class devnull_user_get_class(struct handle_info *hi);
+struct devnull_class *devnull_find_id(unsigned int id);
+struct devnull_class *devnull_find_name(const char *name);
 struct userNode* GetOpServ(void);
 void operpart(struct chanNode *chan, struct userNode *user);
 void operadd(struct userNode *user);