X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=5f495aafbfc8f5e65c993ee7e929a407018d311a;hb=19963bd452eac3c9fc52b3ee60fbf1a81efed7d3;hp=d30526186a4b87c9f2a3c0f21f06b0c0464493ab;hpb=d3ca6510fa23308481d10da0bb7770d251fb659b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index d30526186..5f495aafb 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -816,6 +816,9 @@ void LocalUser::FullConnect()
 	if (!MOD_RESULT)
 		ServerInstance->CallCommandHandler(command, parameters, this);
 
+	if (ServerInstance->Config->RawLog)
+		WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
+
 	/*
 	 * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
 	 * for a user that doesn't exist yet.
@@ -1020,7 +1023,7 @@ void LocalUser::Write(const std::string& text)
 		return;
 	}
 
-	ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%s] O %s", uuid.c_str(), text.c_str());
+	ServerInstance->Logs->Log("USEROUTPUT", RAWIO, "C[%s] O %s", uuid.c_str(), text.c_str());
 
 	eh.AddWriteBuf(text);
 	eh.AddWriteBuf(wide_newline);
@@ -1393,7 +1396,9 @@ void User::DoHostCycle(const std::string &quitline)
 		{
 			for(unsigned int i=0; i < memb->modes.length(); i++)
 				modeline.append(" ").append(nick);
-			snprintf(buffer, MAXBUF, ":%s MODE %s +%s", GetFullHost().c_str(), c->name.c_str(), modeline.c_str());
+			snprintf(buffer, MAXBUF, ":%s MODE %s +%s",
+				ServerInstance->Config->CycleHostsFromUser ? GetFullHost().c_str() : ServerInstance->Config->ServerName.c_str(),
+				c->name.c_str(), modeline.c_str());
 			modeline = buffer;
 		}
 
@@ -1620,7 +1625,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
 					continue;
 			}
 
-			if (!c->config->getString("pass").empty())
+			if (regdone && !c->config->getString("pass").empty())
 			{
 				if (ServerInstance->PassCompare(this, c->config->getString("pass"), password, c->config->getString("hash")))
 				{