Make the notices reporting auth{} privs a bit more serious-looking,

[solanum.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 01a21e879a8b1d36e73b23442199eadb224273d3..d2b58a35d5e5135c0855331e3c2103dba4d69a88 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -314,6 +314,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
                return (CLIENT_EXITED);
        }
 
+       if(IsConfSSLNeeded(aconf) && !IsSSL(source_p))
+       {
+               ServerStats.is_ref++;
+               sendto_one_notice(source_p, ":*** Notice -- You need to use SSL/TLS to use this server");
+               exit_client(client_p, source_p, &me, "Use SSL/TLS");
+               return (CLIENT_EXITED);
+       }
+
        if(!IsGotId(source_p))
        {
                const char *p;
@@ -649,11 +657,21 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
                        else
                                identifyservice_p = NULL;
                        if (identifyservice_p != NULL)
-                               sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
-                                               get_id(source_p, identifyservice_p),
-                                               ConfigFileEntry.identifyservice,
-                                               ConfigFileEntry.identifycommand,
-                                               source_p->localClient->passwd);
+                       {
+                               if (!EmptyString(source_p->localClient->auth_user))
+                                       sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s %s",
+                                                       get_id(source_p, identifyservice_p),
+                                                       ConfigFileEntry.identifyservice,
+                                                       ConfigFileEntry.identifycommand,
+                                                       source_p->localClient->auth_user,
+                                                       source_p->localClient->passwd);
+                               else
+                                       sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
+                                                       get_id(source_p, identifyservice_p),
+                                                       ConfigFileEntry.identifyservice,
+                                                       ConfigFileEntry.identifycommand,
+                                                       source_p->localClient->passwd);
+                       }
                }
                memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
                rb_free(source_p->localClient->passwd);
@@ -784,55 +802,55 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        /* If this user is being spoofed, tell them so */
        if(IsConfDoSpoofIp(aconf))
        {
-               sendto_one_notice(source_p, ":*** Spoofing your IP. congrats.");
+               sendto_one_notice(source_p, ":*** Spoofing your IP");
        }
 
        /* If this user is in the exception class, Set it "E lined" */
        if(IsConfExemptKline(aconf))
        {
                SetExemptKline(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from K/X lines. congrats.");
+               sendto_one_notice(source_p, ":*** You are exempt from K/X");
        }
 
        if(IsConfExemptDNSBL(aconf))
                /* kline exempt implies this, don't send both */
                if(!IsConfExemptKline(aconf))
-                       sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists.");
+                       sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists");
 
        /* If this user is exempt from user limits set it F lined" */
        if(IsConfExemptLimits(aconf))
        {
-               sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats.");
+               sendto_one_notice(source_p, ":*** You are exempt from user limits");
        }
 
        if(IsConfExemptFlood(aconf))
        {
                SetExemptFlood(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from flood limits.");
+               sendto_one_notice(source_p, ":*** You are exempt from flood limits");
        }
 
        if(IsConfExemptSpambot(aconf))
        {
                SetExemptSpambot(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from spambot checks.");
+               sendto_one_notice(source_p, ":*** You are exempt from spambot checks");
        }
 
        if(IsConfExemptJupe(aconf))
        {
                SetExemptJupe(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings.");
+               sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings");
        }
 
        if(IsConfExemptResv(aconf))
        {
                SetExemptResv(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from resvs.");
+               sendto_one_notice(source_p, ":*** You are exempt from resvs");
        }
 
        if(IsConfExemptShide(aconf))
        {
                SetExemptShide(source_p);
-               sendto_one_notice(source_p, ":*** You are exempt from serverhiding.");
+               sendto_one_notice(source_p, ":*** You are exempt from serverhiding");
        }
 }
 
@@ -965,6 +983,8 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                                        source_p->localClient->opername = NULL;
 
                                        rb_dlinkFindDestroy(source_p, &local_oper_list);
+                                       privilegeset_unref(source_p->localClient->privset);
+                                       source_p->localClient->privset = NULL;
                                }
 
                                rb_dlinkFindDestroy(source_p, &oper_list);