ircd: chase capability API changes

[solanum.git] / ircd / s_serv.c

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 20dd4ddd835501ea092c515c82b660889c48a5d2..81143ede97077681113a1d86e67293280ef8afd6 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -72,6 +72,7 @@ static char buf[BUFSIZE];
  * extra argument to "PASS" takes care of checking that.  -orabidoo
  */
 struct CapabilityIndex *serv_capindex = NULL;
+struct CapabilityIndex *cli_capindex = NULL;
 
 unsigned int CAP_CAP;
 unsigned int CAP_QS;
@@ -106,29 +107,31 @@ init_builtin_capabs(void)
        CAP_CAP = capability_put_anonymous(serv_capindex);
        CAP_TS6 = capability_put_anonymous(serv_capindex);
 
-       CAP_QS = capability_put(serv_capindex, "QS");
-       CAP_EX = capability_put(serv_capindex, "EX");
-       CAP_CHW = capability_put(serv_capindex, "CHW");
-       CAP_IE = capability_put(serv_capindex, "IE");
-       CAP_KLN = capability_put(serv_capindex, "KLN");
-       CAP_KNOCK = capability_put(serv_capindex, "KNOCK");
-       CAP_ZIP = capability_put(serv_capindex, "ZIP");
-       CAP_TB = capability_put(serv_capindex, "TB");
-       CAP_UNKLN = capability_put(serv_capindex, "UNKLN");
-       CAP_CLUSTER = capability_put(serv_capindex, "CLUSTER");
-       CAP_ENCAP = capability_put(serv_capindex, "ENCAP");
-       CAP_SERVICE = capability_put(serv_capindex, "SERVICES");
-       CAP_RSFNC = capability_put(serv_capindex, "RSFNC");
-       CAP_SAVE = capability_put(serv_capindex, "SAVE");
-       CAP_EUID = capability_put(serv_capindex, "EUID");
-       CAP_EOPMOD = capability_put(serv_capindex, "EOPMOD");
-       CAP_BAN = capability_put(serv_capindex, "BAN");
-       CAP_MLOCK = capability_put(serv_capindex, "MLOCK");
+       CAP_QS = capability_put(serv_capindex, "QS", NULL);
+       CAP_EX = capability_put(serv_capindex, "EX", NULL);
+       CAP_CHW = capability_put(serv_capindex, "CHW", NULL);
+       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);
+       CAP_ENCAP = capability_put(serv_capindex, "ENCAP", NULL);
+       CAP_SERVICE = capability_put(serv_capindex, "SERVICES", NULL);
+       CAP_RSFNC = capability_put(serv_capindex, "RSFNC", NULL);
+       CAP_SAVE = capability_put(serv_capindex, "SAVE", NULL);
+       CAP_EUID = capability_put(serv_capindex, "EUID", NULL);
+       CAP_EOPMOD = capability_put(serv_capindex, "EOPMOD", NULL);
+       CAP_BAN = capability_put(serv_capindex, "BAN", NULL);
+       CAP_MLOCK = capability_put(serv_capindex, "MLOCK", NULL);
 
        capability_require(serv_capindex, "QS");
        capability_require(serv_capindex, "EX");
        capability_require(serv_capindex, "IE");
        capability_require(serv_capindex, "ENCAP");
+
+       cli_capindex = capability_index_create("client capabilities");
 }
 
 static CNCB serv_connect_callback;
@@ -503,7 +506,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
        int mlen;
        int cur_len;
 
-       cur_len = mlen = rb_sprintf(buf, ":%s BMASK %ld %s %c :",
+       cur_len = mlen = sprintf(buf, ":%s BMASK %ld %s %c :",
                                    me.id, (long) chptr->channelts, chptr->chname, flag);
        t = buf + mlen;
 
@@ -531,9 +534,9 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
                }
 
                if (banptr->forward)
-                       rb_sprintf(t, "%s$%s ", banptr->banstr, banptr->forward);
+                       sprintf(t, "%s$%s ", banptr->banstr, banptr->forward);
                else
-                       rb_sprintf(t, "%s ", banptr->banstr);
+                       sprintf(t, "%s ", banptr->banstr);
                t += tlen;
                cur_len += tlen;
        }
@@ -634,7 +637,7 @@ burst_TS6(struct Client *client_p)
                if(*chptr->chname != '#')
                        continue;
 
-               cur_len = mlen = rb_sprintf(buf, ":%s SJOIN %ld %s %s :", me.id,
+               cur_len = mlen = sprintf(buf, ":%s SJOIN %ld %s %s :", me.id,
                                (long) chptr->channelts, chptr->chname,
                                channel_modes(chptr, client_p));
 
@@ -658,7 +661,7 @@ burst_TS6(struct Client *client_p)
                                t = buf + mlen;
                        }
 
-                       rb_sprintf(t, "%s%s ", find_channel_status(msptr, 1),
+                       sprintf(t, "%s%s ", find_channel_status(msptr, 1),
                                   use_id(msptr->client_p));
 
                        cur_len += tlen;
@@ -868,7 +871,7 @@ server_estab(struct Client *client_p)
        hdata.target = client_p;
        call_hook(h_server_introduced, &hdata);
 
-       rb_snprintf(note, sizeof(note), "Server: %s", client_p->name);
+       snprintf(note, sizeof(note), "Server: %s", client_p->name);
        rb_note(client_p->localClient->F, note);
 
        /*
@@ -973,7 +976,7 @@ server_estab(struct Client *client_p)
 /*
  * serv_connect() - initiate a server connection
  *
- * inputs      - pointer to conf 
+ * inputs      - pointer to conf
  *             - pointer to client doing the connet
  * output      -
  * side effects        -
@@ -1025,7 +1028,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
        }
 
        /* servernames are always guaranteed under HOSTLEN chars */
-       rb_snprintf(note, sizeof(note), "Server: %s", server_p->name);
+       snprintf(note, sizeof(note), "Server: %s", server_p->name);
        rb_note(F, note);
 
        /* Create a local client */
@@ -1157,6 +1160,11 @@ serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
        add_to_cli_connid_hash(client_p);
 
        client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0]));
+       if(!client_p->localClient->ssl_ctl)
+       {
+               serv_connect_callback(client_p->localClient->F, RB_ERROR, data);
+               return;
+       }
        SetSSL(client_p);
        serv_connect_callback(client_p->localClient->F, RB_OK, client_p);
 }