whowas.c: store account name in whowas (#323)

[solanum.git] / ircd / s_serv.c

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 210ed8b1b029b1fc374a0d2aac2e8f6633b190d3..98caf93a6556a57321649ef2bfdb6163820800d2 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -73,7 +73,6 @@ unsigned int CAP_EX;
 unsigned int CAP_CHW;
 unsigned int CAP_IE;
 unsigned int CAP_KLN;
-unsigned int CAP_ZIP;
 unsigned int CAP_KNOCK;
 unsigned int CAP_TB;
 unsigned int CAP_UNKLN;
@@ -116,7 +115,6 @@ init_builtin_capabs(void)
        CAP_IE = capability_put(serv_capindex, "IE", NULL);
        CAP_KLN = capability_put(serv_capindex, "KLN", NULL);
        CAP_KNOCK = capability_put(serv_capindex, "KNOCK", NULL);
-       CAP_ZIP = capability_put(serv_capindex, "ZIP", NULL);
        CAP_TB = capability_put(serv_capindex, "TB", NULL);
        CAP_UNKLN = capability_put(serv_capindex, "UNKLN", NULL);
        CAP_CLUSTER = capability_put(serv_capindex, "CLUSTER", NULL);
@@ -443,12 +441,7 @@ check_server(const char *name, struct Client *client_p)
        }
        attach_server_conf(client_p, server_p);
 
-       /* clear ZIP/TB if they support but we dont want them */
-#ifdef HAVE_LIBZ
-       if(!ServerConfCompressed(server_p))
-#endif
-               ClearCap(client_p, CAP_ZIP);
-
+       /* clear TB if they support but we dont want it */
        if(!ServerConfTb(server_p))
                ClearCap(client_p, CAP_TB);
 
@@ -472,14 +465,12 @@ send_capabilities(struct Client *client_p, unsigned int cap_can_send)
 static void
 burst_ban(struct Client *client_p)
 {
-       rb_dlink_node *ptr;
        struct ConfItem *aconf;
        const char *type;
+       rb_dictionary_iter state;
 
-       RB_DLINK_FOREACH(ptr, prop_bans.head)
+       RB_DICTIONARY_FOREACH(aconf, &state, prop_bans_dict)
        {
-               aconf = ptr->data;
-
                /* Skip expired stuff. */
                if(aconf->lifetime < rb_current_time())
                        continue;
@@ -622,11 +613,18 @@ burst_TS6(struct Client *client_p)
                                   use_id(target_p),
                                   target_p->user->away);
 
-               if(IsOper(target_p) && target_p->user && target_p->user->opername && target_p->user->privset)
-                       sendto_one(client_p, ":%s OPER %s %s",
-                                       use_id(target_p),
-                                       target_p->user->opername,
-                                       target_p->user->privset->name);
+               if (IsOper(target_p) && target_p->user && target_p->user->opername)
+               {
+                       if (target_p->user->privset)
+                               sendto_one(client_p, ":%s OPER %s %s",
+                                               use_id(target_p),
+                                               target_p->user->opername,
+                                               target_p->user->privset->name);
+                       else
+                               sendto_one(client_p, ":%s OPER %s",
+                                               use_id(target_p),
+                                               target_p->user->opername);
+               }
 
                hclientinfo.target = target_p;
                call_hook(h_burst_client, &hclientinfo);
@@ -792,7 +790,6 @@ server_estab(struct Client *client_p)
 
                /* pass info to new server */
                send_capabilities(client_p, default_server_capabs | CAP_MASK
-                                 | (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0)
                                  | (ServerConfTb(server_p) ? CAP_TB : 0));
 
                sendto_one(client_p, "SERVER %s 1 :%s%s",
@@ -804,12 +801,6 @@ server_estab(struct Client *client_p)
        if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE))
                ilog_error("rb_set_buffers failed for server");
 
-       /* Enable compression now */
-       if(IsCapable(client_p, CAP_ZIP))
-       {
-               start_zlib_session(client_p);
-       }
-
        client_p->servptr = &me;
 
        if(IsAnyDead(client_p))
@@ -1311,7 +1302,6 @@ serv_connect_callback(rb_fde_t *F, int status, void *data)
 
        /* pass my info to the new server */
        send_capabilities(client_p, default_server_capabs | CAP_MASK
-                         | (ServerConfCompressed(server_p) ? CAP_ZIP_SUPPORTED : 0)
                          | (ServerConfTb(server_p) ? CAP_TB : 0));
 
        sendto_one(client_p, "SERVER %s 1 :%s%s",