From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Sat, 19 Jul 2008 08:57:00 +0000 (+0200)
Subject: version 0.3.11
X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=commitdiff_plain;h=746a74c9963728fcbbfe4cdc36c863c653a142ca

version 0.3.11
---

diff --git a/include/global.h b/include/global.h
index 094d3f2..55d8857 100644
--- a/include/global.h
+++ b/include/global.h
@@ -7,7 +7,7 @@
 
 #define VERSION_MAJOR		"0"
 #define VERSION_MINOR		"3"
-#define VERSION_RELEASE		"10"
+#define VERSION_RELEASE		"11"
 #define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
 
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;
diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index d7dc27b..f22b25a 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -106,7 +106,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		// loop through all trust entries in xml and add to database if we don't already know them
 		for(long i=0; i<xml.TrustCount(); i++)
 		{
-			int id;
+			int id=-1;
 			std::string identity;
 			std::string messagetrustcomment="";
 			std::string trustlisttrustcomment="";
@@ -135,41 +135,44 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 			st.Reset();
 
 			//insert trust for this identity
-			trustst.Bind(0,identityid);
-			trustst.Bind(1,id);
-			if(xml.GetMessageTrust(i)==-1)
+			if(id!=-1)
 			{
-				trustst.Bind(2);
-			}
-			else
-			{
-				trustst.Bind(2,xml.GetMessageTrust(i));
-			}
-			if(xml.GetTrustListTrust(i)==-1)
-			{
-				trustst.Bind(3);
-			}
-			else
-			{
-				trustst.Bind(3,xml.GetTrustListTrust(i));
-			}
-			messagetrustcomment=xml.GetMessageTrustComment(i);
-			trustlisttrustcomment=xml.GetTrustListTrustComment(i);
-			// limit comments to 50 characters each
-			if(messagetrustcomment.size()>50)
-			{
-				messagetrustcomment.erase(50);
-			}
-			if(trustlisttrustcomment.size()>50)
-			{
-				trustlisttrustcomment.erase(50);
+				trustst.Bind(0,identityid);
+				trustst.Bind(1,id);
+				if(xml.GetMessageTrust(i)==-1)
+				{
+					trustst.Bind(2);
+				}
+				else
+				{
+					trustst.Bind(2,xml.GetMessageTrust(i));
+				}
+				if(xml.GetTrustListTrust(i)==-1)
+				{
+					trustst.Bind(3);
+				}
+				else
+				{
+					trustst.Bind(3,xml.GetTrustListTrust(i));
+				}
+				messagetrustcomment=xml.GetMessageTrustComment(i);
+				trustlisttrustcomment=xml.GetTrustListTrustComment(i);
+				// limit comments to 50 characters each
+				if(messagetrustcomment.size()>50)
+				{
+					messagetrustcomment.erase(50);
+				}
+				if(trustlisttrustcomment.size()>50)
+				{
+					trustlisttrustcomment.erase(50);
+				}
+				trustst.Bind(4,messagetrustcomment);
+				trustst.Bind(5,trustlisttrustcomment);
+				trustst.Step();
+				trustst.Reset();
 			}
-			trustst.Bind(4,messagetrustcomment);
-			trustst.Bind(5,trustlisttrustcomment);
-			trustst.Step();
-			trustst.Reset();
-
 		}
+
 		trustst.Finalize();
 		st.Finalize();