Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 02:55:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

warning suppression, removed unused p3portservice from compilation

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-02-23 22:17:06 +00:00
parent ede337b7d4
commit 3d11b15490
7 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/rsserver/p3peers.cc
View file

@ -54,7 +54,6 @@ RsPeers *rsPeers = NULL;
* #define P3PEERS_DEBUG 1
*******/
static uint32_t RsPeerTranslateTrust(uint32_t trustLvl);
int ensureExtension(std::string &name, std::string def_ext);
std::string RsPeerTrustString(uint32_t trustLvl)

8
libretroshare/src/rsserver/rsinit.cc
View file

@ -1142,7 +1142,12 @@ int RsInit::LoadCertificates(bool autoLoginNT)
gpgme_data_t cipher;
gpgme_data_t plain;
gpgme_data_new (&plain);
gpgme_error_t error_reading_file = gpgme_data_new_from_stream (&cipher, sslPassphraseFile);
if( gpgme_data_new_from_stream (&cipher, sslPassphraseFile) != GPG_ERR_NO_ERROR)
{
std::cerr << "Error while creating stream from ssl passwd file." << std::endl ;
return 0 ;
}
if (0 < AuthGPG::getAuthGPG()->decryptText(cipher, plain)) {
std::cerr << "Decrypting went ok !" << std::endl;
gpgme_data_write (plain, "", 1);
@ -1791,7 +1796,6 @@ int RsServer::StartupRetroShare()
emergencyPartialsDir += "Partials";
/* if we've loaded an old format file! */
bool oldFormat = false;
std::map<std::string, std::string> oldConfigMap;
AuthSSL::getAuthSSL() -> setConfigDirectories(certConfigFile, certNeighDir);