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

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

diff --git a/modules/m_version.c b/modules/m_version.c
index 08b918aa849bcdae1be8364485bdeb18c8d1777a..60d793c579fabc8407f1941dc32a57c1efeb273c 100644 (file)
--- a/modules/m_version.c
+++ b/modules/m_version.c
@@ -51,7 +51,6 @@ DECLARE_MODULE_AV1(version, NULL, NULL, version_clist, NULL, NULL, "$Revision: 1
 
 /*
  * m_version - VERSION command handler
- *      parv[0] = sender prefix
  *      parv[1] = remote server
  */
 static int
@@ -61,7 +60,7 @@ m_version(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if(parc > 1)
        {
-               if((last_used + ConfigFileEntry.pace_wait) > CurrentTime)
+               if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
                {
                        /* safe enough to give this on a local connect only */
                        sendto_one(source_p, form_str(RPL_LOAD2HI),
@@ -69,7 +68,7 @@ m_version(struct Client *client_p, struct Client *source_p, int parc, const char
                        return 0;
                }
                else
-                       last_used = CurrentTime;
+                       last_used = rb_current_time();
 
                if(hunt_server(client_p, source_p, ":%s VERSION :%s", 1, parc, parv) != HUNTED_ISME)
                        return 0;
@@ -87,7 +86,6 @@ m_version(struct Client *client_p, struct Client *source_p, int parc, const char
 
 /*
  * mo_version - VERSION command handler
- *      parv[0] = sender prefix
  *      parv[1] = remote server
  */
 static int
@@ -122,10 +120,6 @@ confopts(struct Client *source_p)
        if(ConfigChannel.use_except)
                *p++ = 'e';
 
-       if(ConfigFileEntry.glines)
-               *p++ = 'g';
-       *p++ = 'G';
-
        /* might wanna hide this :P */
        if(ServerInfo.hub)
                *p++ = 'H';
@@ -149,7 +143,7 @@ confopts(struct Client *source_p)
        *p++ = 'Z';
 #endif
 
-#ifdef IPV6
+#ifdef RB_IPV6
        *p++ = '6';
 #endif