From 09b2633b01c1e76207759ae773f8de3c6835f0c8 Mon Sep 17 00:00:00 2001
From: joss17 <joss17@users.sourceforge.net>
Date: Mon, 15 Mar 2010 19:14:43 +0000
Subject: [PATCH] avoid sending bad gpg cert in p3disc

Conflicts:

	libretroshare/src/services/p3disc.cc

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/services/p3disc.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libretroshare/src/services/p3disc.cc b/libretroshare/src/services/p3disc.cc
index 62d21d276..1f7eb59af 100644
--- a/libretroshare/src/services/p3disc.cc
+++ b/libretroshare/src/services/p3disc.cc
@@ -383,7 +383,10 @@ void p3disc::sendPeerDetails(std::string to, std::string about) {
         }
         std::string cert = AuthGPG::getAuthGPG()->SaveCertificateToString(about);
         if (cert == "") {
-            cert = "No Key";
+            #ifdef P3DISC_DEBUG
+            std::cerr << "p3disc::sendPeerDetails() don't send details because the gpg cert is not good" << std::endl;
+            #endif
+            return;
         }
         di -> certGPG = cert;
 
@@ -512,7 +515,7 @@ void p3disc::recvPeerDetails(RsDiscReply *item)
             #endif
             return;
         }
-        if (item->aboutId != certGpgId) {
+        if (item->aboutId == "" || item->aboutId != certGpgId) {
  #ifdef P3DISC_DEBUG
         std::cerr << "p3disc::recvPeerFriendMsg() Error : about id is not the same as gpg id." << std::endl;
 #endif