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
This commit is contained in:
joss17 2010-03-15 19:14:43 +00:00
parent e9d42e1965
commit 09b2633b01

View File

@ -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