Change ServerInfo::gecos to description

diff --git a/include/protocol.h b/include/protocol.h
index 2e512f11ae5a6f5906068eeff34405bebb2a0571..7a2908a4c8a6dd92bb79aad14017a9c036acae0f 100644 (file)
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -46,7 +46,7 @@ class CoreExport ProtocolInterface
         public:
                std::string servername;
                std::string parentname;
-               std::string gecos;
+               std::string description;
                unsigned int usercount;
                unsigned int opercount;
                unsigned int latencyms;

diff --git a/include/server.h b/include/server.h
index e54a379bce36a215f438c0cd7126aef219316f8f..d73c9673a8136302035de22e83971b54bf34c8cf 100644 (file)
--- a/include/server.h
+++ b/include/server.h
@@ -53,7 +53,7 @@ class CoreExport Server : public classbase
         */
        const std::string& GetName() const { return name; }
 
-       /** Returns the description (GECOS) of this server
+       /** Returns the description of this server
         * @return The description of this server
         */
        const std::string& GetDesc() const { return description; }

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 00cab319790fb769a56911d2dd14b1509a3164d9..bc5d53c946a883c07676bb3779e87fc9b0a6e77f 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -97,8 +97,8 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener
 
                        if ((http->GetURI() == "/stats") || (http->GetURI() == "/stats/"))
                        {
-                               data << "<inspircdstats><server><name>" << ServerInstance->Config->ServerName << "</name><gecos>"
-                                       << Sanitize(ServerInstance->Config->ServerDesc) << "</gecos><version>"
+                               data << "<inspircdstats><server><name>" << ServerInstance->Config->ServerName << "</name><description>"
+                                       << Sanitize(ServerInstance->Config->ServerDesc) << "</description><version>"
                                        << Sanitize(ServerInstance->GetVersionString()) << "</version></server>";
 
                                data << "<general>";
@@ -211,7 +211,7 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener
                                        data << "<server>";
                                        data << "<servername>" << b->servername << "</servername>";
                                        data << "<parentname>" << b->parentname << "</parentname>";
-                                       data << "<gecos>" << Sanitize(b->gecos) << "</gecos>";
+                                       data << "<description>" << Sanitize(b->description) << "</description>";
                                        data << "<usercount>" << b->usercount << "</usercount>";
 // This is currently not implemented, so, commented out.
 //                                     data << "<opercount>" << b->opercount << "</opercount>";

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 2436e74f8fc425daa1e2cfe790bb32ff6c4d63a4..98b4be88d1a7da0091545a01ca23ec002f8f1e0a 100644 (file)
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -267,7 +267,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
                                }
                                else if (command == "SERVER")
                                {
-                                       // :001 SERVER inspircd.test 002 [<anything> ...] :gecos
+                                       // :001 SERVER inspircd.test 002 [<anything> ...] :description
                                        //     A      B             C
                                        std::string::size_type c = line.find(' ', b + 1);
                                        if (c == std::string::npos)

diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index be95845a7e2302d46d63876252cc11aef09b28e1..b3326581b6abb073334ef794d97a6a3177a35487 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -38,7 +38,7 @@ void SpanningTreeProtocolInterface::GetServerList(ServerList& sl)
                ps.parentname = s ? s->GetName() : "";
                ps.usercount = i->second->UserCount;
                ps.opercount = i->second->OperCount;
-               ps.gecos = i->second->GetDesc();
+               ps.description = i->second->GetDesc();
                ps.latencyms = i->second->rtt;
                sl.push_back(ps);
        }