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)

1 files changed, 4 insertions, 2 deletions

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);