version 0.3.1

diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp
index e422d29..409a0f7 100644 (file)
--- a/src/freenet/introductionpuzzleinserter.cpp
+++ b/src/freenet/introductionpuzzleinserter.cpp
@@ -202,7 +202,9 @@ const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
        }\r
 \r
        xml.SetType("captcha");\r
-       xml.SetUUID(uuid.toString()+"@"+keypart);\r
+       std::string uuidstr=uuid.toString();\r
+       StringFunctions::UpperCase(uuidstr,uuidstr);\r
+       xml.SetUUID(uuidstr+"@"+keypart);\r
        xml.SetPuzzleData(encodedpuzzle);\r
        xml.SetMimeType("image/bmp");\r
 \r

diff --git a/src/freenet/trustlistxml.cpp b/src/freenet/trustlistxml.cpp
index 20fa730..9132427 100644 (file)
--- a/src/freenet/trustlistxml.cpp
+++ b/src/freenet/trustlistxml.cpp
@@ -218,7 +218,7 @@ const bool TrustListXML::ParseXML(const std::string &xml)
                                m_log->error("TrustListXML::ParseXML malformed Trust in TrustList.xml");\r
                        }\r
 \r
-                       trustel=XMLGetNextSibling(root,"Trust");\r
+                       trustel=XMLGetNextSibling(trustel,"Trust");\r
                }\r
 \r
                parsed=true;\r

diff --git a/src/message.cpp b/src/message.cpp
index 526dbd2..897ceed 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -250,7 +250,9 @@ void Message::HandleAdministrationMessage()
                                        insert.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d"));\r
                                        insert.Bind(1,Poco::DateTimeFormatter::format(now,"%H:%M:%S"));\r
                                        insert.Bind(2,identityname+" Trust Changed");\r
-                                       insert.Bind(3,uuid.toString());\r
+                                       std::string uuidstr=uuid.toString();\r
+                                       StringFunctions::UpperCase(uuidstr,uuidstr);\r
+                                       insert.Bind(3,uuidstr);\r
                                        insert.Bind(4,boardid);\r
                                        insert.Bind(5,messagebody);\r
                                        insert.Step(true);\r
@@ -557,6 +559,8 @@ const bool Message::ParseNNTPMessage(const std::string &nntpmessage)
        try\r
        {\r
                uuid=uuidgen.createRandom();\r
+               m_messageuuid=uuid.toString();\r
+               StringFunctions::UpperCase(m_messageuuid,m_messageuuid);\r
        }\r
        catch(...)\r
        {\r