Add can_kick_deop() and use it in m_kick.

diff --git a/include/channel.h b/include/channel.h
index 22b7e7056dacdd49f27da97214f9d712c8966331..4252b2a63f74698956db681ed11f4fed22bea55b 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -229,6 +229,7 @@ extern struct membership *find_channel_membership(struct Channel *, struct Clien
 extern const char *find_channel_status(struct membership *msptr, int combine);
 extern int is_any_op(struct membership *msptr);
 extern int is_chanop_voiced(struct membership *msptr);
+extern int can_kick_deop(struct membership *source, struct membership *target);
 extern void add_user_to_channel(struct Channel *, struct Client *, int flags);
 extern void remove_user_from_channel(struct membership *);
 extern void remove_user_from_channels(struct Client *);

diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index 4eb2cfae0dde1a5346034968f95385075fec981a..368c7153fbcf46c60c564775e5ee5b9b827d8a27 100644 (file)
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -97,7 +97,7 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
                        return 0;
                }
 
-               if(!is_chanop(msptr) && !IsOverride(source_p))
+               if(!can_kick_deop(msptr, find_channel_membership(chptr, client_p)) && !IsOverride(source_p))
                {
                        if(MyConnect(source_p))
                        {

diff --git a/src/channel.c b/src/channel.c
index 0fd0f03863b601b13939b5fed057446697b09fd3..c3e8cd984d123f4baa1faab750349a077f7d5c85 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -226,6 +226,22 @@ is_chanop_voiced(struct membership *msptr)
                return 0;
 }
 
+/* can_kick_deop()
+ *
+ * input       - two memeberships
+ * output      - 1 if the first memebership can kick/deop the second, 0 elsewise
+ * side effects -
+ */
+int
+can_kick_deop(struct membership *source, struct membership *target)
+{
+       /* This does not do much yet. That will change when +ah is in. */
+       if(!is_any_op(source))
+               return 0;
+       else
+               return 1;
+}
+
 /* add_user_to_channel()
  *
  * input       - channel to add client to, client to add, channel flags