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

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

diff --git a/modules/m_names.c b/modules/m_names.c
index c4bd65fd480d5fba106e93b62712d0fc82c57f69..d01baeb50969a982771328e6214fd8b5e0e95c2f 100644 (file)
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -25,13 +25,11 @@
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
-#include "tools.h"
 #include "channel.h"
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -59,7 +57,6 @@ static void names_global(struct Client *source_p);
 
 /*
  * m_names
- *      parv[0] = sender prefix
  *      parv[1] = channel
  */
 static int
@@ -93,7 +90,7 @@ m_names(struct Client *client_p, struct Client *source_p, int parc, const char *
        {
                if(!IsOper(source_p))
                {
-                       if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+                       if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
                        {
                                sendto_one(source_p, form_str(RPL_LOAD2HI),
                                           me.name, source_p->name, "NAMES");
@@ -102,7 +99,7 @@ m_names(struct Client *client_p, struct Client *source_p, int parc, const char *
                                return 0;
                        }
                        else
-                               last_used = CurrentTime;
+                               last_used = rb_current_time();
                }
 
                names_global(source_p);