Change the defaul nicklen back to 31. This is more efficient due to struct packing.

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

diff --git a/modules/m_cap.c b/modules/m_cap.c
index f394caeb1e6a46c9d58b162806db73bd3acd4c13..acc3515ea1a0c79687c2ae449297efe349f631a4 100644 (file)
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -27,7 +27,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *

- * $Id: m_cap.c 676 2006-02-03 20:05:09Z gxti $

  */
 
 #include "stdinc.h"
  */
 
 #include "stdinc.h"


@@ -69,8 +68,7 @@ static struct clicap
        int namelen;
 } clicap_list[] = {
        _CLICAP("multi-prefix", CLICAP_MULTI_PREFIX, 0, 0),
        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))
 };
 
 #define CLICAP_LIST_LEN (sizeof(clicap_list) / sizeof(struct clicap))


@@ -175,7 +173,7 @@ clicap_generate(struct Client *source_p, const char *subcmd, int flags, int clea
        char *p;
        int buflen = 0;
        int curlen, mlen;
        char *p;
        int buflen = 0;
        int curlen, mlen;

-       int i;
+       size_t i;

 
        mlen = rb_sprintf(buf, ":%s CAP %s %s",
                        me.name, 
 
        mlen = rb_sprintf(buf, ":%s CAP %s %s",
                        me.name, 


@@ -320,7 +318,7 @@ cap_end(struct Client *source_p, const char *arg)
 
        source_p->flags &= ~FLAGS_CLICAP;
 
 
        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));
        {
                char buf[USERLEN+1];
                rb_strlcpy(buf, source_p->username, sizeof(buf));