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 f394caeb1e6a46c9d58b162806db73bd3acd4c13..6e06ef73ccc0aee63509feebd472531b43a12187 100644 (file)
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -69,8 +69,7 @@ static struct clicap
        int namelen;
 } clicap_list[] = {
        _CLICAP("multi-prefix", CLICAP_MULTI_PREFIX, 0, 0),
-       _CLICAP("sasl", CLICAP_SASL, 0, 0),
-       _CLICAP("presence", CLICAP_PRESENCE, 0, 0)
+       _CLICAP("sasl", CLICAP_SASL, 0, 0)
 };
 
 #define CLICAP_LIST_LEN (sizeof(clicap_list) / sizeof(struct clicap))
@@ -175,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, 
@@ -320,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));