is_ircop/is_admin/is_service: allow protocol-specific check

Adapted from upstream commit 7790fdb.

Author: ilbelkyr

include/phandler.h

@@ -241,6 +241,13 @@ E void (*topiclock_sts)(channel_t *c);
 E void (*quarantine_sts)(user_t *source, user_t *victim, long duration, const char *reason);
 /* Ask the proto module if this is valid as an extban */
 E bool (*is_extban)(const char *mask);
+/* previously located in libathemecore/function.c; used for various
+ * things that need to know whether a given user has ircd privs */
+E bool (*is_ircop)(user_t *u);
+/* as above; not used for much */
+E bool (*is_admin)(user_t *u);
+/* as above; used to respect external services clients */
+E bool (*is_service)(user_t *u);
 
 E unsigned int generic_server_login(void);
 E void generic_introduce_nick(user_t *u);
@@ -286,6 +293,9 @@ E void generic_mlock_sts(channel_t *c);
 E void generic_topiclock_sts(channel_t *c);
 E void generic_quarantine_sts(user_t *source, user_t *victim, long duration, const char *reason);
 E bool generic_is_extban(const char *mask);
+E bool generic_is_ircop(user_t *u);
+E bool generic_is_admin(user_t *u);
+E bool generic_is_service(user_t *u);
 
 E struct cmode_ *mode_list;
 E struct extmode *ignore_mode_list;

include/users.h

@@ -69,11 +69,8 @@ typedef struct {
 } hook_user_delete_t;
 
 /* function.c */
-E bool is_ircop(user_t *user);
-E bool is_admin(user_t *user);
 E bool is_internal_client(user_t *user);
 E bool is_autokline_exempt(user_t *user);
-E bool is_service(user_t *user);
 
 /* users.c */
 E mowgli_patricia_t *userlist;

libathemecore/function.c

@@ -781,22 +781,6 @@ bool is_founder(mychan_t *mychan, myentity_t *mt)
 	return false;
 }
 
-bool is_ircop(user_t *user)
-{
-	if (UF_IRCOP & user->flags)
-		return true;
-
-	return false;
-}
-
-bool is_admin(user_t *user)
-{
-	if (UF_ADMIN & user->flags)
-		return true;
-
-	return false;
-}
-
 bool is_autokline_exempt(user_t *user)
 {
 	mowgli_node_t *n;
@@ -811,14 +795,6 @@ bool is_autokline_exempt(user_t *user)
 	return false;
 }
 
-bool is_service(user_t *user)
-{
-	if (UF_SERVICE & user->flags)
-		return true;
-
-	return false;
-}
-
 char *sbytes(float x)
 {
 	if (x > 1073741824.0)

libathemecore/phandler.c

@@ -68,6 +68,9 @@ void (*mlock_sts)(channel_t *c) = generic_mlock_sts;
 void (*topiclock_sts)(channel_t *c) = generic_topiclock_sts;
 void (*quarantine_sts)(user_t *source, user_t *victim, long duration, const char *reason) = generic_quarantine_sts;
 bool (*is_extban)(const char *mask) = generic_is_extban;
+bool (*is_ircop)(user_t *u) = generic_is_ircop;
+bool (*is_admin)(user_t *u) = generic_is_admin;
+bool (*is_service)(user_t *u) = generic_is_service;
 
 unsigned int generic_server_login(void)
 {
@@ -397,6 +400,30 @@ bool generic_is_extban(const char *mask)
 	return false;
 }
 
+bool generic_is_ircop(user_t *u)
+{
+	if (UF_IRCOP & u->flags)
+		return true;
+
+	return false;
+}
+
+bool generic_is_admin(user_t *u)
+{
+	if (UF_ADMIN & u->flags)
+		return true;
+
+	return false;
+}
+
+bool generic_is_service(user_t *u)
+{
+	if (UF_SERVICE & u->flags)
+		return true;
+
+	return false;
+}
+
 /* vim:cinoptions=>s,e0,n0,f0,{0,}0,^0,=s,ps,t0,c3,+s,(2s,us,)20,*30,gs,hs
  * vim:ts=8
  * vim:sw=8