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

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

diff --git a/modules/m_cap.c b/modules/m_cap.c
index 998d8f0d1966cd597543a925aa80e7cec62c2ce5..6e06ef73ccc0aee63509feebd472531b43a12187 100644 (file)
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -33,7 +33,7 @@
 #include "stdinc.h"
 #include "class.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "msg.h"
@@ -174,7 +174,7 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags, int clea
        char *p;
        int buflen = 0;
        int curlen, mlen;
-       int i;
+       size_t i;
 
        mlen = rb_sprintf(buf, ":%s CAP %s %s",
                        me.name, 
@@ -319,7 +319,7 @@ cap_end(struct Client *source_p, const char *arg)
 
        source_p->flags &= ~FLAGS_CLICAP;
 
-       if(source_p->name[0] && source_p->user)
+       if(source_p->name[0] && source_p->flags & FLAGS_SENTUSER)
        {
                char buf[USERLEN+1];
                rb_strlcpy(buf, source_p->username, sizeof(buf));