move user_join() to channels.c

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

diff --git a/src/s_user.c b/src/s_user.c
index 7d7bc1b94cc8af544c7754d7ceef750f6a5ecd97..3086828476d31c787c04dfdde139dbe38e43e6ec 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -68,8 +68,8 @@ int user_modes[256] = {
        /* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x3F */
        0,                      /* @ */
        0,                      /* A */
-       0,                      /* B */
-       0,                      /* C */
+       UMODE_BOT,              /* B */
+       UMODE_NOCTCP,           /* C */
        UMODE_DEAF,             /* D */
        0,                      /* E */
        0,                      /* F */
@@ -88,7 +88,7 @@ int user_modes[256] = {
        UMODE_SERVICE,          /* S */
        0,                      /* T */
        0,                      /* U */
-       0,                      /* V */
+       UMODE_NOINVITE,         /* V */
        0,                      /* W */
        0,                      /* X */
        0,                      /* Y */
@@ -561,7 +561,9 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 
        /* they get a reduced limit */
        if(find_tgchange(source_p->sockhost))
-               USED_TARGETS(source_p) = 6;
+               source_p->localClient->targets_free = TGCHANGE_INITIAL_LOW;
+       else
+               source_p->localClient->targets_free = TGCHANGE_INITIAL;
 
        monitor_signon(source_p);
        user_welcome(source_p);
@@ -589,6 +591,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
        hook_data_umode_changed hdata;
        hook_data_client hdata2;
        char sockhost[HOSTLEN];
+       struct ConfItem *aconf;
 
        if(MyClient(source_p))
                send_umode(source_p, source_p, 0, 0, ubuf);
@@ -633,6 +636,11 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
                      IsIPSpoof(source_p) ? "0" : sockhost,
                      source_p->id, source_p->info);
 
+       if(!EmptyString(source_p->certfp))
+               sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
+                               ":%s ENCAP * CERTFP :%s",
+                               use_id(source_p), source_p->certfp);
+
        if (IsDynSpoof(source_p))
        {
                sendto_server(client_p, NULL, CAP_TS6, use_euid ? CAP_EUID : NOCAPS, ":%s ENCAP * REALHOST %s",
@@ -696,6 +704,17 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
        hdata2.target = source_p;
        call_hook(h_introduce_client, &hdata2);
 
+       /* Do all the auth::autojoin wizardry once we're connected */
+       if(MyConnect(source_p))
+       {
+               aconf = source_p->localClient->att_conf;
+
+               if(aconf->autojoin != NULL)
+               {
+                       user_join(client_p, source_p, aconf->autojoin, NULL, 0);
+               }
+       }
+
        return 0;
 }
 
@@ -1274,6 +1293,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 {
        unsigned int old = source_p->umodes, oldsnomask = source_p->snomask;
        hook_data_umode_changed hdata;
+       struct ConfItem *aconf;
 
        SetOper(source_p);
 
@@ -1335,6 +1355,18 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
        sendto_one_notice(source_p, ":*** Oper privs are %s", oper_p->privset->privs);
        send_oper_motd(source_p);
 
+       aconf = source_p->localClient->att_conf;
+
+       /* Do the auth::autojoin_opers wizardry here */
+       if(aconf->autojoin_opers != NULL)
+       {
+               /* opers should never be banned from the opers channel.
+                * Plus this is post-umode being set so you'll pass +I $o or +O.
+                * Hence why we're making this a normal clean join. --jdhore
+                */
+               user_join(&me, source_p, aconf->autojoin_opers, NULL, 0);
+       }
+
        return (1);
 }