chmode: Remove chm_regonly, a vestige from ratbox which doesn't apply to native chary...

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 7d7bc1b94cc8af544c7754d7ceef750f6a5ecd97..4782304e4446398a8b395236c14854590e8c7f98 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -336,7 +336,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                }
 
                /* dont replace username if its supposed to be spoofed --fl */
-               if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->name, '@'))
+               if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'))
                {
                        p = username;
 
@@ -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);
@@ -633,6 +635,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",
@@ -647,8 +654,8 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 
        if(MyConnect(source_p) && source_p->localClient->passwd)
        {
-               if (ConfigFileEntry.identifyservice[0] != '\0' &&
-                               ConfigFileEntry.identifycommand[0] != '\0')
+               if (!EmptyString(ConfigFileEntry.identifyservice) &&
+                               !EmptyString(ConfigFileEntry.identifycommand))
                {
                        /* use user@server */
                        p = strchr(ConfigFileEntry.identifyservice, '@');