Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

[irc/rqf/shadowircd.git] / modules / m_xline.c

diff --git a/modules/m_xline.c b/modules/m_xline.c
index 566a36928f15db4a5c3010bf6a2d129ca81f6b7b..d1975ecdb8436b98745023364e83e3354d482958 100644 (file)
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -283,7 +283,6 @@ valid_xline(struct Client *source_p, const char *gecos, const char *reason)
 void
 apply_xline(struct Client *source_p, const char *name, const char *reason, int temp_time, int propagated)
 {
-       rb_dlink_node *ptr;
        struct ConfItem *aconf;
 
        aconf = make_conf();
@@ -524,7 +523,7 @@ remove_xline(struct Client *source_p, const char *name, int propagated)
                                deactivate_conf(aconf, ptr);
                                return;
                        }
-                       else if(MyClient(source_p) && rb_dlink_list_length(&cluster_conf_list))
+                       else if(propagated && rb_dlink_list_length(&cluster_conf_list))
                                cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
                        if(!aconf->hold)
                        {
@@ -552,7 +551,7 @@ remove_xline(struct Client *source_p, const char *name, int propagated)
                }
        }
 
-       if(MyClient(source_p) && rb_dlink_list_length(&cluster_conf_list))
+       if(propagated && rb_dlink_list_length(&cluster_conf_list))
                cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER, "%s", name);
 
        sendto_one_notice(source_p, ":No X-Line for %s", name);