X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/54ff6988394742ca703482fd5a0ef08c9cd8e817..b2c208be091670e3c5259eba77187bae6ac6eece:/modules/m_cap.c

diff --git a/modules/m_cap.c b/modules/m_cap.c
index f394caeb..7abfa9fe 100644
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -70,7 +70,10 @@ static struct clicap
 } clicap_list[] = {
 	_CLICAP("multi-prefix",	CLICAP_MULTI_PREFIX, 0, 0),
 	_CLICAP("sasl", CLICAP_SASL, 0, 0),
-	_CLICAP("presence", CLICAP_PRESENCE, 0, 0)
+	_CLICAP("account-notify", CLICAP_ACCOUNT_NOTIFY, 0, 0),
+	_CLICAP("extended-join", CLICAP_EXTENDED_JOIN, 0, 0),
+	_CLICAP("away-notify", CLICAP_AWAY_NOTIFY, 0, 0),
+	_CLICAP("tls", CLICAP_TLS, 0, 0),
 };
 
 #define CLICAP_LIST_LEN (sizeof(clicap_list) / sizeof(struct clicap))
@@ -175,7 +178,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 +323,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));