X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fnntp%2Fnntpconnection.cpp;h=cc5cffe6fb99dc31b412e9eeb030c0b790fcd44e;hp=fa35f4f831e8f0d5cb8f84a9b6cf41a0cbacbab6;hb=4430e7762844c66428b6f822288beb71b7f82b95;hpb=ee580d19b7920904587e18d72a3465d52eab6204

diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp
index fa35f4f..cc5cffe 100644
--- a/src/nntp/nntpconnection.cpp
+++ b/src/nntp/nntpconnection.cpp
@@ -317,7 +317,7 @@ const bool NNTPConnection::HandleListCommand(const NNTPCommand &command)
 				show=uwildmat((*i).GetBoardName().c_str(),arg2.c_str());
 			}
 
-			if(show==true)
+			if(show==true && (*i).GetSaveReceivedMessages()==true)
 			{
 				tempstr << (*i).GetBoardName() << " " << (*i).GetHighMessageID() << " " << (*i).GetLowMessageID() << " " << (m_status.m_allowpost ? "y" : "n");
 				SendBufferedLine(tempstr.str());
@@ -348,7 +348,7 @@ const bool NNTPConnection::HandleListCommand(const NNTPCommand &command)
 				show=uwildmat((*i).GetBoardName().c_str(),arg2.c_str());
 			}
 
-			if(show==true)
+			if(show==true && (*i).GetSaveReceivedMessages()==true)
 			{
 				tempstr << (*i).GetBoardName() << "\t" << (*i).GetBoardDescription();
 				SendBufferedLine(tempstr.str());
@@ -559,9 +559,12 @@ const bool NNTPConnection::HandleNewGroupsCommand(const NNTPCommand &command)
 
 		for(BoardList::iterator i=bl.begin(); i!=bl.end(); i++)
 		{
-			std::ostringstream tempstr;
-			tempstr << (*i).GetBoardName() << " " << (*i).GetHighMessageID() << " " << (*i).GetLowMessageID() << " " << m_status.m_allowpost ? "y" : "n";
-			SendBufferedLine(tempstr.str());
+			if((*i).GetSaveReceivedMessages()==true)
+			{
+				std::ostringstream tempstr;
+				tempstr << (*i).GetBoardName() << " " << (*i).GetHighMessageID() << " " << (*i).GetLowMessageID() << " " << m_status.m_allowpost ? "y" : "n";
+				SendBufferedLine(tempstr.str());
+			}
 		}
 
 		SendBufferedLine(".");
@@ -784,16 +787,13 @@ void NNTPConnection::HandlePostedMessage(const std::string &message)
 		{
 			mess.HandleAdministrationMessage();
 		}
+		if(mess.StartFreenetInsert())
+		{
+			SendBufferedLine("240 Article received OK");
+		}
 		else
 		{
-			if(mess.StartFreenetInsert())
-			{
-				SendBufferedLine("240 Article received OK");
-			}
-			else
-			{
-				SendBufferedLine("441 Posting failed.  Make sure the identity you are sending with exists!");
-			}
+			SendBufferedLine("441 Posting failed.  Make sure the identity you are sending with exists!");
 		}
 	}
 	else