Send only one ERR_MLOCKRESTRICTED per MODE command.

[irc/rqf/shadowircd.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index cad1b7f5a4b51f2dee94e36026a771b35f1a3943..9e8c737dd3bf74e8723e11556eb9367b4d77c180 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -22,7 +22,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: client.c 3514 2007-06-06 16:25:21Z nenolod $
  */
 #include "stdinc.h"
 #include "config.h"
@@ -424,10 +423,10 @@ notify_banned_client(struct Client *client_p, struct ConfItem *aconf, int ban)
        const char *reason = NULL;
        const char *exit_reason = conn_closed;
 
-       if(ConfigFileEntry.kline_with_reason && !EmptyString(aconf->passwd))
+       if(ConfigFileEntry.kline_with_reason)
        {
-               reason = aconf->passwd;
-               exit_reason = aconf->passwd;
+               reason = get_user_ban_reason(aconf);
+               exit_reason = reason;
        }
        else
        {
@@ -1146,6 +1145,9 @@ exit_generic_client(struct Client *client_p, struct Client *source_p, struct Cli
        if(IsOper(source_p))
                rb_dlinkFindDestroy(source_p, &oper_list);
 
+       /* get rid of any metadata the user may have */
+       user_metadata_clear(source_p);
+
        sendto_common_channels_local(source_p, ":%s!%s@%s QUIT :%s",
                                     source_p->name,
                                     source_p->username, source_p->host, comment);
@@ -1659,6 +1661,7 @@ struct User *
 make_user(struct Client *client_p)
 {
        struct User *user;
+       struct Dictionary *metadata;
 
        user = client_p->user;
        if(!user)
@@ -1666,6 +1669,9 @@ make_user(struct Client *client_p)
                user = (struct User *) rb_bh_alloc(user_heap);
                user->refcnt = 1;
                client_p->user = user;
+
+               metadata = irc_dictionary_create(irccmp);
+               client_p->user->metadata = metadata;
        }
        return user;
 }
@@ -1709,6 +1715,7 @@ free_user(struct User *user, struct Client *client_p)
        {
                if(user->away)
                        rb_free((char *) user->away);
+               
                /*
                 * sanity check
                 */
@@ -1924,3 +1931,96 @@ error_exit_client(struct Client *client_p, int error)
 
        exit_client(client_p, client_p, &me, errmsg);
 }
+
+/*
+ * user_metadata_add
+ * 
+ * inputs      - pointer to client struct
+ *             - name of metadata item you wish to add
+ *             - value of metadata item
+ *             - 1 if metadata should be propegated, 0 if not
+ * output      - none
+ * side effects - metadata is added to the user in question
+ *             - metadata is propegated if propegate is set.
+ */
+struct Metadata *
+user_metadata_add(struct Client *target, const char *name, const char *value, int propegate)
+{
+       struct Metadata *md;
+
+       md = rb_malloc(sizeof(struct Metadata));
+       md->name = rb_strdup(name);
+       md->value = rb_strdup(value);
+
+       irc_dictionary_add(target->user->metadata, md->name, md);
+       
+       if(propegate)
+               sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA ADD %s %s :%s",
+                               target->id, name, value);
+
+       return md;
+}
+
+/*
+ * user_metadata_delete
+ * 
+ * inputs      - pointer to client struct
+ *             - name of metadata item you wish to delete
+ * output      - none
+ * side effects - metadata is deleted from the user in question
+ *             - deletion is propegated if propegate is set
+ */
+void
+user_metadata_delete(struct Client *target, const char *name, int propegate)
+{
+       struct Metadata *md = user_metadata_find(target, name);
+
+       if(!md)
+               return;
+
+       irc_dictionary_delete(target->user->metadata, md->name);
+
+       rb_free(md);
+
+       if(propegate)
+               sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA DELETE %s %s",
+                               target->id, name);
+}
+
+/*
+ * user_metadata_find
+ * 
+ * inputs      - pointer to client struct
+ *             - name of metadata item you wish to read
+ * output      - the requested metadata, if it exists, elsewise null.
+ * side effects - 
+ */
+struct Metadata *
+user_metadata_find(struct Client *target, const char *name)
+{
+       if(!target->user)
+               return NULL;
+
+       if(!target->user->metadata)
+               return NULL;
+
+       return irc_dictionary_retrieve(target->user->metadata, name);
+}
+/*
+ * user_metadata_clear
+ * 
+ * inputs      - pointer to user struct
+ * output      - none
+ * side effects - metadata is cleared from the user in question
+ */
+void
+user_metadata_clear(struct Client *target)
+{
+       struct Metadata *md;
+       struct DictionaryIter iter;
+       
+       DICTIONARY_FOREACH(md, &iter, target->user->metadata)
+       {
+               user_metadata_delete(target, md->name, 0);
+       }
+}