Filter bogus CTCP ACTION messages.

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

diff --git a/modules/m_locops.c b/modules/m_locops.c
index bd2a175a39ef80a76a83b4318f8a83fb0a6de307..f774ed823129f2be6595d4b04b3992303b7fc760 100644 (file)
--- a/modules/m_locops.c
+++ b/modules/m_locops.c
@@ -21,13 +21,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_locops.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"
@@ -54,7 +53,6 @@ DECLARE_MODULE_AV1(locops, NULL, NULL, locops_clist, NULL, NULL, "$Revision: 254
 /*
  * m_locops - LOCOPS message handler
  * (write to *all* local opers currently online)
- *      parv[0] = sender prefix
  *      parv[1] = message text
  */
 static int
@@ -62,7 +60,7 @@ m_locops(struct Client *client_p, struct Client *source_p, int parc, const char
 {
        sendto_wallops_flags(UMODE_LOCOPS, source_p, "LOCOPS - %s", parv[1]);
        
-       if(dlink_list_length(&cluster_conf_list) > 0)
+       if(rb_dlink_list_length(&cluster_conf_list) > 0)
                cluster_generic(source_p, "LOCOPS", SHARED_LOCOPS, CAP_CLUSTER,
                                ":%s", parv[1]);
 
@@ -72,8 +70,8 @@ m_locops(struct Client *client_p, struct Client *source_p, int parc, const char
 static int
 ms_locops(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       /* parv[0]  parv[1]      parv[2]
-        * oper     target serv  message
+       /* source_p  parv[1]      parv[2]
+        * oper      target serv  message
         */
        propagate_generic(source_p, "LOCOPS", parv[1], CAP_CLUSTER, 
                                ":%s", parv[2]);
@@ -81,7 +79,7 @@ ms_locops(struct Client *client_p, struct Client *source_p, int parc, const char
        if(!match(parv[1], me.name))
                return 0;
 
-       if(find_shared_conf("*", "*", source_p->user->server, SHARED_LOCOPS))
+       if(find_shared_conf("*", "*", source_p->servptr->name, SHARED_LOCOPS))
                sendto_wallops_flags(UMODE_LOCOPS, source_p, "SLOCOPS - %s", parv[2]);
 
        return 0;
@@ -94,7 +92,7 @@ me_locops(struct Client *client_p, struct Client *source_p,
        if(!IsPerson(source_p))
                return 0;
 
-       if(find_shared_conf("*", "*", source_p->user->server, SHARED_LOCOPS))
+       if(find_shared_conf("*", "*", source_p->servptr->name, SHARED_LOCOPS))
                sendto_wallops_flags(UMODE_LOCOPS, source_p, "SLOCOPS - %s", parv[1]);
 
        return 0;