Fix FIDENT response forging to run prior to the ENCAP strip

[user/henk/code/inspircd.git] / src / stats.cpp

diff --git a/src/stats.cpp b/src/stats.cpp
index ef708251f14cae5ad5b292d2e8adbc0ce408214b..fb4e5e7a54317c23acd08fd28841b57cd8765c4a 100644 (file)
--- a/src/stats.cpp
+++ b/src/stats.cpp
@@ -80,10 +80,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                                else
                                        res << c->host;
 
-                               if (c->port)
-                                       res << ' ' << c->port << ' ';
-                               else
-                                       res << " * ";
+                               res << ' ' << c->config->getString("port", "*") << ' ';
 
                                res << c->GetRecvqMax() << ' ' << c->GetSendqSoftMax() << ' ' << c->GetSendqHardMax()
                                        << ' ' << c->GetCommandRate() << ' ' << c->GetPenaltyThreshold();
@@ -288,7 +285,7 @@ void InspIRCd::DoStats(char statschar, User* user, string_list &results)
                                        if (mh && mh->NeedsOper() && tag->AllowedChanModes[c])
                                                cmodes.push_back(c);
                                }
-                               results.push_back(sn+" 243 "+user->nick+" O"+tag->name + " " + umodes + " " + cmodes);
+                               results.push_back(sn+" 243 "+user->nick+" O "+tag->NameStr() + " " + umodes + " " + cmodes);
                        }
                }
                break;