mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Fix a bug when adding a cert
Conflicts: libretroshare/src/pqi/authgpg.cc git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@2730 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
87525b5c82
commit
9eccfef9c1
@ -1248,8 +1248,11 @@ bool AuthGPG::LoadCertificateFromString(std::string str, std::string &gpg_id)
|
||||
#ifdef GPG_DEBUG
|
||||
std::cerr << "AuthGPG::LoadCertificateFromString() returning with gpg_id : " << gpg_id << std::endl;
|
||||
#endif
|
||||
|
||||
return true;
|
||||
if (gpg_id == "") {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
|
@ -981,7 +981,11 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
|
||||
std::cerr << "ConnectFriendWizard : Parse ip address error." << std::endl;
|
||||
}
|
||||
|
||||
return true;
|
||||
if (pd.gpg_id == "") {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user