Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

code cleaning

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-27 20:39:14 +00:00
parent 16949dded9
commit 9132dcf700
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libretroshare/src/rsserver/rsinit.cc
View File

@ -1337,11 +1337,11 @@ int RsInit::LoadCertificates(bool autoLoginNT)
gpgme_error_t error_reading_file = gpgme_data_new_from_stream (&cipher, sslPassphraseFile); gpgme_error_t error_reading_file = gpgme_data_new_from_stream (&cipher, sslPassphraseFile);
if (0 < authMgr->decryptText(cipher, plain)) { if (0 < authMgr->decryptText(cipher, plain)) {
std::cerr << "Decrypting went ok !" << std::endl; std::cerr << "Decrypting went ok !" << std::endl;
gpgme_data_write (plain, "", 1); gpgme_data_write (plain, "", 1);
sslPassword = gpgme_data_release_and_get_mem(plain, NULL); sslPassword = gpgme_data_release_and_get_mem(plain, NULL);
} else { } else {
gpgme_data_release (plain); gpgme_data_release (plain);
std::cerr << "Error : decrypting went wrong !" << std::endl; std::cerr << "Error : decrypting went wrong !" << std::endl;
return 0; return 0;
} }
gpgme_data_release (cipher); gpgme_data_release (cipher);
@ -1932,14 +1932,7 @@ int RsServer::StartupRetroShare()
mAuthMgr = getAuthMgr(); mAuthMgr = getAuthMgr();
/**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP)
if (1 != mAuthMgr -> InitAuth(NULL, NULL, NULL)) if (1 != mAuthMgr -> InitAuth(NULL, NULL, NULL))
#else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
if (1 != mAuthMgr -> InitAuth(NULL, NULL, NULL))
#endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
{ {
std::cerr << "main() - Fatal Error....." << std::endl; std::cerr << "main() - Fatal Error....." << std::endl;
std::cerr << "Invalid Certificate configuration!" << std::endl; std::cerr << "Invalid Certificate configuration!" << std::endl;
@ -1968,7 +1961,6 @@ int RsServer::StartupRetroShare()
} }
/**************************************************************************/ /**************************************************************************/
// Load up Certificates, and Old Configuration (if present) // Load up Certificates, and Old Configuration (if present)
std::string certConfigFile = RsInitConfig::configDir.c_str(); std::string certConfigFile = RsInitConfig::configDir.c_str();
@ -2160,13 +2152,6 @@ int RsServer::StartupRetroShare()
/* Hack Old Configuration into new System (first load only) */ /* Hack Old Configuration into new System (first load only) */
/**************************************************************************/ /**************************************************************************/
/**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP)
#else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
#endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
/**************************************************************************/ /**************************************************************************/
/* trigger generalConfig loading for classes that require it */ /* trigger generalConfig loading for classes that require it */
/**************************************************************************/ /**************************************************************************/
@ -2269,7 +2254,6 @@ int RsServer::StartupRetroShare()
rsPhoto = new p3Photo(photoService); rsPhoto = new p3Photo(photoService);
rsStatus = new p3Status(); rsStatus = new p3Status();
rsQblog = new p3Blog(mQblog); rsQblog = new p3Blog(mQblog);
#else #else
rsGameLauncher = NULL; rsGameLauncher = NULL;
rsPhoto = NULL; rsPhoto = NULL;
@ -2294,7 +2278,3 @@ int RsServer::StartupRetroShare()
return 1; return 1;
} }