From 211bed049d7073ea95789eeedc483541f8a85b2c Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Mon, 12 Sep 2016 13:09:15 +0200
Subject: removed USER_SETTINGS etc.

(this also changes filename of the crt ans rsa files, but this shouldn't
be a problem. (formerly the name of those files depended on the name and
location of the ini-files)
---
 src/server/net/certmanager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/server/net/certmanager.cpp')

diff --git a/src/server/net/certmanager.cpp b/src/server/net/certmanager.cpp
index 5ba81e3..b85966a 100644
--- a/src/server/net/certmanager.cpp
+++ b/src/server/net/certmanager.cpp
@@ -18,6 +18,8 @@
 #include "certmanager.h"
 #include "../util/util.h"
 #include <QMap>
+#include <QDir>
+#include <QDebug>
 #include <QFileInfo>
 #include <QSettings>
 #include <cstdlib>
@@ -38,8 +40,7 @@ bool getPrivateKeyAndCert(const QString &name, QSslKey &key, QSslCertificate &ce
 		cert = _certs[name];
 		return true;
 	}
-	USER_SETTINGS(settings);
-	QString certFile = settings.fileName().append(".").append(name);
+	QString certFile = QDir::homePath().append("/").append(CERTSTORAGE).append(name);
 	QString keyFile = certFile;
 	keyFile.append(".rsa");
 	certFile.append(".crt");
@@ -48,6 +49,7 @@ bool getPrivateKeyAndCert(const QString &name, QSslKey &key, QSslCertificate &ce
 	{
 		generateFiles(keyFile, certFile);
 		if (!loadFiles(keyFile, certFile, key, cert))
+			qDebug() << "error while creating cert and key files\n";
 			return false;
 	}
 	_certs.insert(name, cert);
-- 
cgit v1.2.3-55-g7522