Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-30 09:56:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #603 from G10h4ck/master

Browse Source 
Coherent behaviour of general config with auto-login compile option
This commit is contained in:
csoler 2016-12-15 12:36:27 +01:00 committed by GitHub
commit c3443df83c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroshare-gui/src/gui/settings/GeneralPage.cpp
View File

@ -32,8 +32,8 @@
#include <gui/QuickStartWizard.h>
/** Constructor */
GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags)
GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags) :
ConfigPage(parent, flags)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
@ -75,6 +75,13 @@ GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags)
#endif
}
ui.useLocalServer->setEnabled(true);
#ifdef RS_AUTOLOGIN
ui.autoLogin->setToolTip(tr("For security reasons the usage of auto-login is discouraged, you can enable it but you are on your own!"));
#else // RS_AUTOLOGIN
ui.autoLogin->setEnabled(false);
ui.autoLogin->setToolTip(tr("Your RetroShare build has auto-login disabled."));
#endif // RS_AUTOLOGIN
}
/** Destructor */

2
retroshare.pri
View File

@ -151,5 +151,5 @@ sqlcipher:DEFINES -= NO_SQLCIPHER
no_sqlcipher:DEFINES *= NO_SQLCIPHER
rs_autologin {
DEFINES *= RS_AUTOLOGIN
warning(You have enabled RetroShare auto-login, this is discouraged. The usage of auto-login on some linux distributions may allow someone having access to your session to steal the SSL keys of your node location and therefore compromise your security)
warning("You have enabled RetroShare auto-login, this is discouraged. The usage of auto-login on some linux distributions may allow someone having access to your session to steal the SSL keys of your node location and therefore compromise your security")
}