From af3e43ce4e2e248dbef517a18b9cfbca9cfed807 Mon Sep 17 00:00:00 2001
From: joss17 <joss17@users.sourceforge.net>
Date: Tue, 27 Oct 2009 20:46:17 +0000
Subject: [PATCH] code cleaning

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1732 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/rsserver/rsinit.cc | 29 +++++++++-------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

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