Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-19 21:04:32 -05: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@1732 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-27 20:46:17 +00:00
parent 96fd660065
commit af3e43ce4e
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,23 +46,14 @@
// for blocking signals // for blocking signals
#include <signal.h> #include <signal.h>
/**************** PQI_USE_XPGP ******************/ #if defined(PQI_USE_SSLONLY)
#if defined(PQI_USE_XPGP) #include "pqi/authssl.h"
#include "pqi/authxpgp.h"
#else /* X509 Certificates */ #else /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
/**************** PQI_USE_SSLONLY ***************/ /**************** PQI_USE_SSLONLY ***************/
#if defined(PQI_USE_SSLONLY) /**************** SSL + OPENPGP *****************/
#include "pqi/authssl.h" #include "pqi/authgpg.h"
#else /* X509 Certificates */ #include "pqi/authssl.h"
/**************** PQI_USE_SSLONLY ***************/
/**************** SSL + OPENPGP *****************/
#include "pqi/authgpg.h"
#include "pqi/authssl.h"
#endif /* X509 Certificates */
/**************** SSL + OPENPGP *****************/
#endif /* X509 Certificates */ #endif /* X509 Certificates */
/**************** PQI_USE_XPGP ******************/
class accountId class accountId
{ {
@ -740,15 +731,13 @@ static bool checkAccount(std::string accountdir, accountId &id)
std::cerr << "checkAccount() dir: " << accountdir << std::endl; std::cerr << "checkAccount() dir: " << accountdir << std::endl;
/**************** PQI_USE_XPGP ******************/ bool ret = false;
/* check against authmanagers private keys */
bool ret = LoadCheckX509andGetName(cert_name.c_str(), id.sslName, id.sslId);
/* check against authmanagers private keys */
LoadCheckX509andGetName(cert_name.c_str(), id.sslName, id.sslId);
std::cerr << "sslName: " << id.sslName << " id: " << id.sslId << std::endl; std::cerr << "sslName: " << id.sslName << " id: " << id.sslId << std::endl;
#ifdef PQI_USE_SSLONLY #ifndef PQI_USE_SSLONLY
#else // PGP+SSL
std::string pgpid;
std::string tmpid; std::string tmpid;
if (LoadCheckX509andGetIssuerName(cert_name.c_str(), id.pgpId, tmpid)) if (LoadCheckX509andGetIssuerName(cert_name.c_str(), id.pgpId, tmpid))
{ {