Replace most usages of "GECOS" with "real" or "real name".

diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index d1e7528404631bcc9dd09bc65c7314da48698d6d..12fc613aaebf9ce127f967be17111f98ffb7d65a 100644 (file)
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -836,8 +836,8 @@
         # maxkick: Maximum length of a kick message.
         maxkick="255"
 
-        # maxgecos: Maximum length of a real name (gecos).
-        maxgecos="128"
+        # maxreal: Maximum length of a real name.
+        maxreal="128"
 
         # maxaway: Maximum length of an away message.
         maxaway="200">

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index c8fd94c06c3ba64721608926c75aa2aba6ed8944..6c3357d2938db14477a9880ff27693a732fa74d7 100644 (file)
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -819,7 +819,7 @@
 #<module name="flashpolicyd">                                         #
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Gecos (real name) ban: Implements extended ban 'r', which stops anyone
+# Real name ban: Implements extended ban 'r', which stops anyone
 # matching a mask like +b r:*realname?here* from joining a channel.
 #<module name="gecosban">
 

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 6af0c7c5584e84c3661f65fe17bc5706dbce6992..2447024a1e9d1fa08d782a87ba7c10fd512410c6 100644 (file)
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -45,9 +45,9 @@ namespace WhoWas
                 */
                const std::string server;
 
-               /** Full name (GECOS)
+               /** Real name
                 */
-               const std::string gecos;
+               const std::string real;
 
                /** Signon time
                 */

diff --git a/include/configreader.h b/include/configreader.h
index b603f2e10f060e26483802c964a6d59e25fbc50c..81ec014a029e60c9919f92ecc5bf4bb13c07186c 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -103,8 +103,8 @@ class ServerLimits
        size_t MaxTopic;
        /** Maximum kick message length */
        size_t MaxKick;
-       /** Maximum GECOS (real name) length */
-       size_t MaxGecos;
+       /** Maximum real name length */
+       size_t MaxReal;
        /** Maximum away message length */
        size_t MaxAway;
        /** Maximum line length */

diff --git a/include/modules.h b/include/modules.h
index 432e7075221c160656b524b981849eac92291e86..302c2e4d729a398f58f759f4178091bca578198d 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -222,7 +222,7 @@ enum Implementation
        I_OnRawMode, I_OnCheckKey, I_OnCheckLimit, I_OnCheckBan, I_OnCheckChannelBan, I_OnExtBanCheck,
        I_OnChangeLocalUserHost, I_OnPreTopicChange,
        I_OnPostTopicChange, I_OnPostConnect, I_OnPostDeoper,
-       I_OnChangeLocalUserGECOS, I_OnUserRegister, I_OnChannelPreDelete, I_OnChannelDelete,
+       I_OnPreChangeRealName, I_OnUserRegister, I_OnChannelPreDelete, I_OnChannelDelete,
        I_OnPostOper, I_OnSetAway, I_OnPostCommand, I_OnPostJoin,
        I_OnBuildNeighborList, I_OnGarbageCollect, I_OnSetConnectClass,
        I_OnUserMessage, I_OnPassCompare, I_OnNamesListItem, I_OnNumeric,
@@ -580,12 +580,12 @@ class CoreExport Module : public classbase, public usecountbase
         */
        virtual void OnChangeHost(User* user, const std::string &newhost);
 
-       /** Called whenever a user's GECOS (realname) is changed.
+       /** Called whenever a user's real name is changed.
         * This event triggers after the name has been set.
-        * @param user The user who's GECOS is being changed
-        * @param gecos The new GECOS being set on the user
+        * @param user The user who's real name is being changed
+        * @param name The new real name being set on the user
         */
-       virtual void OnChangeName(User* user, const std::string &gecos);
+       virtual void OnChangeName(User* user, const std::string& real);
 
        /** Called whenever a user's IDENT is changed.
         * This event triggers after the name has been set.
@@ -841,13 +841,13 @@ class CoreExport Module : public classbase, public usecountbase
         */
        virtual ModResult OnChangeLocalUserHost(LocalUser* user, const std::string &newhost);
 
-       /** Called whenever a change of a local users GECOS (fullname field) is attempted.
-        * return 1 to deny the name change, or 0 to allow it.
-        * @param user The user whos GECOS will be changed
-        * @param newhost The new GECOS
-        * @return 1 to deny the GECOS change, 0 to allow
+       /** Called whenever a change of a local users real name is attempted.
+        * return MOD_RES_DENY to deny the name change, or MOD_RES_ALLOW to allow it.
+        * @param user The user whos real name will be changed
+        * @param newhost The new real name.
+        * @return MOD_RES_DENY to deny the real name change, MOD_RES_ALLOW to allow
         */
-       virtual ModResult OnChangeLocalUserGECOS(LocalUser* user, const std::string &newhost);
+       virtual ModResult OnPreChangeRealName(LocalUser* user, const std::string &newhost);
 
        /** Called before a topic is changed.
         * Return 1 to deny the topic change, 0 to check details on the change, -1 to let it through with no checks

diff --git a/include/modules/sql.h b/include/modules/sql.h
index 59955107d632d764074ff0e6196bfac4aea83bb9..1f5bb7ff3f7cb469e79f6d3950d18666c1999622 100644 (file)
--- a/include/modules/sql.h
+++ b/include/modules/sql.h
@@ -260,7 +260,7 @@ inline void SQL::PopulateUserInfo(User* user, ParamMap& userinfo)
        userinfo["nick"] = user->nick;
        userinfo["host"] = user->GetRealHost();
        userinfo["ip"] = user->GetIPString();
-       userinfo["gecos"] = user->fullname;
+       userinfo["real"] = user->fullname;
        userinfo["ident"] = user->ident;
        userinfo["server"] = user->server->GetName();
        userinfo["uuid"] = user->uuid;

diff --git a/include/users.h b/include/users.h
index 88858b160f9352a6f78d0fa3de0847b1e9541b43..bcddab1bfa08b518acefc05df6f712f88eac41bc 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -308,7 +308,7 @@ class CoreExport User : public Extensible
         */
        std::string ident;
 
-       /** The users full name (GECOS).
+       /** The users full name.
         */
        std::string fullname;
 
@@ -707,10 +707,10 @@ class CoreExport User : public Extensible
         * ALWAYS use this function, rather than writing User::fullname directly,
         * as this triggers module events allowing the change to be syncronized to
         * remote servers.
-        * @param gecos The user's new realname
+        * @param real The user's new real name
         * @return True if the change succeeded, false if otherwise
         */
-       bool ChangeName(const std::string& gecos);
+       bool ChangeName(const std::string& real);
 
        /** Change a user's nick
         * @param newnick The new nick. If equal to the users uuid, the nick change always succeeds.

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 125bf595de7b089e6299530f04786d28dcdafd08..52d349f5cac46166b1e32f59c1649336955bea3d 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -37,7 +37,7 @@ ServerLimits::ServerLimits(ConfigTag* tag)
        , MaxQuit(tag->getUInt("maxquit", 255))
        , MaxTopic(tag->getUInt("maxtopic", 307))
        , MaxKick(tag->getUInt("maxkick", 255))
-       , MaxGecos(tag->getUInt("maxgecos", 128))
+       , MaxReal(tag->getUInt("maxreal", tag->getUInt("maxgecos", 128)))
        , MaxAway(tag->getUInt("maxaway", 200))
        , MaxLine(tag->getUInt("maxline", 512))
        , MaxHost(tag->getUInt("maxhost", 64))

diff --git a/src/coremods/core_user/cmd_user.cpp b/src/coremods/core_user/cmd_user.cpp
index f49b1339ceed347c8c89822991b5b32131be7a89..75fab929f5816f51b23678b72ef65916af759952 100644 (file)
--- a/src/coremods/core_user/cmd_user.cpp
+++ b/src/coremods/core_user/cmd_user.cpp
@@ -48,7 +48,7 @@ CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters)
                else
                {
                        user->ChangeIdent(parameters[0]);
-                       user->fullname.assign(parameters[3].empty() ? "No info" : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
+                       user->fullname.assign(parameters[3].empty() ? "No info" : parameters[3], 0, ServerInstance->Config->Limits.MaxReal);
                        user->registered = (user->registered | REG_USER);
                }
        }

diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp
index 6bcf6448b1b144e8e525ae70fd7e92da9bb48db7..73251b442d0757d8adb533aec9aadb0c1050b3fa 100644 (file)
--- a/src/coremods/core_whowas.cpp
+++ b/src/coremods/core_whowas.cpp
@@ -62,7 +62,7 @@ CmdResult CommandWhowas::Handle(User* user, const Params& parameters)
                {
                        WhoWas::Entry* u = *i;
 
-                       user->WriteNumeric(RPL_WHOWASUSER, parameters[0], u->ident, u->dhost, '*', u->gecos);
+                       user->WriteNumeric(RPL_WHOWASUSER, parameters[0], u->ident, u->dhost, '*', u->real);
 
                        if (user->HasPrivPermission("users/auspex"))
                                user->WriteNumeric(RPL_WHOWASIP, parameters[0], InspIRCd::Format("was connecting from *@%s", u->host.c_str()));
@@ -245,7 +245,7 @@ WhoWas::Entry::Entry(User* user)
        , dhost(user->GetDisplayedHost())
        , ident(user->ident)
        , server(user->server->GetName())
-       , gecos(user->fullname)
+       , real(user->fullname)
        , signon(user->signon)
 {
 }

diff --git a/src/modules.cpp b/src/modules.cpp
index 334111e6d42936968079fee171da5d11ac3a62fd..7e602d9443fcca14d77243c4697d355ed68bda45 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -109,7 +109,7 @@ ModResult   Module::OnCheckChannelBan(User*, Channel*) { DetachEvent(I_OnCheckChan
 ModResult      Module::OnCheckBan(User*, Channel*, const std::string&) { DetachEvent(I_OnCheckBan); return MOD_RES_PASSTHRU; }
 ModResult      Module::OnExtBanCheck(User*, Channel*, char) { DetachEvent(I_OnExtBanCheck); return MOD_RES_PASSTHRU; }
 ModResult      Module::OnChangeLocalUserHost(LocalUser*, const std::string&) { DetachEvent(I_OnChangeLocalUserHost); return MOD_RES_PASSTHRU; }
-ModResult      Module::OnChangeLocalUserGECOS(LocalUser*, const std::string&) { DetachEvent(I_OnChangeLocalUserGECOS); return MOD_RES_PASSTHRU; }
+ModResult      Module::OnPreChangeRealName(LocalUser*, const std::string&) { DetachEvent(I_OnPreChangeRealName); return MOD_RES_PASSTHRU; }
 ModResult      Module::OnPreTopicChange(User*, Channel*, const std::string&) { DetachEvent(I_OnPreTopicChange); return MOD_RES_PASSTHRU; }
 ModResult      Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { DetachEvent(I_OnPassCompare); return MOD_RES_PASSTHRU; }
 void           Module::OnPostConnect(User*) { DetachEvent(I_OnPostConnect); }

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index fa35732b86596e57f7dd74bcf26f903c34668a84..d0a4d6fdc5acfda09c080e19820b44d79152c7ef 100644 (file)
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -49,7 +49,7 @@ class CommandChgname : public Command
                        return CMD_FAILURE;
                }
 
-               if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
+               if (parameters[1].length() > ServerInstance->Config->Limits.MaxReal)
                {
                        user->WriteNotice("*** CHGNAME: Real name is too long");
                        return CMD_FAILURE;

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 3bede1ad23ced12dd566db3521f68a99e35916ae..bc2b0f3d993c2d37542653a4447b6cb73fe31c46 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -34,7 +34,7 @@ class CommandSetname : public Command
 
        CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               if (parameters[0].size() > ServerInstance->Config->Limits.MaxGecos)
+               if (parameters[0].size() > ServerInstance->Config->Limits.MaxReal)
                {
                        user->WriteNotice("*** SETNAME: Real name is too long");
                        return CMD_FAILURE;

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 97b4a90af6bcb8eaf5271680f16547c13996b49d..342945c3aa921c3d330e5e243264380d7c0e2b03 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -163,9 +163,12 @@ void TreeSocket::SendCapabilities(int phase)
                extra = " CHALLENGE=" + this->GetOurChallenge();
        }
 
-       // 2.0 needs this key
+       // 2.0 needs these keys.
        if (proto_version == 1202)
+       {
                extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion));
+               extra.append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal));
+       }
 
        this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
                        ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+
@@ -175,7 +178,7 @@ void TreeSocket::SendCapabilities(int phase)
                        " MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+
                        " MAXTOPIC="+ConvToStr(ServerInstance->Config->Limits.MaxTopic)+
                        " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+
-                       " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
+                       " MAXREAL="+ConvToStr(ServerInstance->Config->Limits.MaxReal)+
                        " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
                        " MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+
                        extra+

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0d153737fcdcfa38ce8c5a8d3b8dc7d210d277e0..344a6088bd0994f86e83220fb0447b7e11ac1a8d 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -493,12 +493,12 @@ void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
        CmdBuilder(user, "FHOST").push(newhost).Broadcast();
 }
 
-void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
+void ModuleSpanningTree::OnChangeName(User* user, const std::string& real)
 {
        if (user->registered != REG_ALL || !IS_LOCAL(user))
                return;
 
-       CmdBuilder(user, "FNAME").push_last(gecos).Broadcast();
+       CmdBuilder(user, "FNAME").push_last(real).Broadcast();
 }
 
 void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 20c1ac2b93e19a4286bf01bcc9ece432a54cf161..b6374e32e0d4089c8ddba3e7de1220776768b6e9 100644 (file)
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -152,7 +152,7 @@ class ModuleSpanningTree : public Module, public Stats::EventListener
        void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE;
        void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE;
        void OnChangeHost(User* user, const std::string &newhost) CXX11_OVERRIDE;
-       void OnChangeName(User* user, const std::string &gecos) CXX11_OVERRIDE;
+       void OnChangeName(User* user, const std::string& real) CXX11_OVERRIDE;
        void OnChangeIdent(User* user, const std::string &ident) CXX11_OVERRIDE;
        void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE;
        void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) CXX11_OVERRIDE;

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index f9cff6c0d03420fba7240a2720be2fb372e95765..86933dc729d871621028de8f692b99b9b24a6fee 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -30,7 +30,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
 {
        /**
         *      0    1    2    3    4    5        6        7     8        9       (n-1)
-        * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :gecos
+        * UID uuid age nick host dhost ident ip.string signon +modes (modepara) :real
         */
        time_t age_t = ServerCommand::ExtractTS(params[1]);
        time_t signon = ServerCommand::ExtractTS(params[7]);

diff --git a/src/users.cpp b/src/users.cpp
index 81e6512a1e435bd977bc06863b3945327e4c4608..20480da07a2545deaffdf162439ec3eef32ba1a7 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -995,20 +995,20 @@ bool User::SharesChannelWith(User *other)
        return false;
 }
 
-bool User::ChangeName(const std::string& gecos)
+bool User::ChangeName(const std::string& real)
 {
-       if (!this->fullname.compare(gecos))
+       if (!this->fullname.compare(real))
                return true;
 
        if (IS_LOCAL(this))
        {
                ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(OnChangeLocalUserGECOS, MOD_RESULT, (IS_LOCAL(this),gecos));
+               FIRST_MOD_RESULT(OnPreChangeRealName, MOD_RESULT, (IS_LOCAL(this), real));
                if (MOD_RESULT == MOD_RES_DENY)
                        return false;
-               FOREACH_MOD(OnChangeName, (this,gecos));
+               FOREACH_MOD(OnChangeName, (this, real));
        }
-       this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
+       this->fullname.assign(real, 0, ServerInstance->Config->Limits.MaxReal);
 
        return true;
 }