author | zecke <zecke> | 2004-10-12 14:59:06 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-12 14:59:06 (UTC) |
commit | 4eed63767cedb0d96b116c4b9233405ca93e5541 (patch) (unidiff) | |
tree | 0c4157b445a1536a43e9fc49217327f8a13df8a5 | |
parent | d557d195e8f89f521be8a5b7a0bd071261bb2dbf (diff) | |
download | opie-4eed63767cedb0d96b116c4b9233405ca93e5541.zip opie-4eed63767cedb0d96b116c4b9233405ca93e5541.tar.gz opie-4eed63767cedb0d96b116c4b9233405ca93e5541.tar.bz2 |
-Skip showing the Security screen if onResume or onPoweron is set to false
-rw-r--r-- | libopie2/opiesecurity/multiauthpassword.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libopie2/opiesecurity/multiauthpassword.cpp b/libopie2/opiesecurity/multiauthpassword.cpp index 8eda554..6c8944e 100644 --- a/libopie2/opiesecurity/multiauthpassword.cpp +++ b/libopie2/opiesecurity/multiauthpassword.cpp | |||
@@ -80,46 +80,46 @@ bool MultiauthPassword::needToAuthenticate(bool at_poweron) | |||
80 | * and then will lock the screen and ask for a successful | 80 | * and then will lock the screen and ask for a successful |
81 | * authentication (explaining what it does or not, depending | 81 | * authentication (explaining what it does or not, depending |
82 | * on your local configuration). | 82 | * on your local configuration). |
83 | * It may go into an event loop, but anyhow it will only end | 83 | * It may go into an event loop, but anyhow it will only end |
84 | * when the user has successfully authenticated to the system. | 84 | * when the user has successfully authenticated to the system. |
85 | */ | 85 | */ |
86 | void MultiauthPassword::authenticate(int lockMode) | 86 | void MultiauthPassword::authenticate(int lockMode) |
87 | { | 87 | { |
88 | /** | 88 | /** |
89 | * \par Conditions | 89 | * \par Conditions |
90 | * | 90 | * |
91 | * If lockMode is an If, it's conditional: | 91 | * If lockMode is an If, it's conditional: |
92 | * \li IfPowerOn will not trigger an authentication if | 92 | * \li IfPowerOn will not trigger an authentication if |
93 | * onStart is set to false in Security.conf, | 93 | * onStart is set to false in Security.conf, |
94 | * \li IfResume will not trigger an authentication if | 94 | * \li IfResume will not trigger an authentication if |
95 | * onResume is set to false in Security.conf. | 95 | * onResume is set to false in Security.conf. |
96 | */ | 96 | */ |
97 | if ( (lockMode == IfPowerOn) || (lockMode == IfResume) ) | 97 | if ( (lockMode == IfPowerOn) || (lockMode == IfResume) ) |
98 | { | 98 | { |
99 | Config cfg("Security"); | 99 | Config cfg("Security"); |
100 | cfg.setGroup("Misc"); | 100 | cfg.setGroup("Misc"); |
101 | if ( ( | 101 | if ( ( |
102 | (lockMode == IfPowerOn) && cfg.readBoolEntry("onStart", false) | 102 | (lockMode == IfPowerOn) && !cfg.readBoolEntry("onStart", false) |
103 | ) || ( | 103 | ) || ( |
104 | (lockMode == IfResume) && cfg.readBoolEntry("onResume", false) | 104 | (lockMode == IfResume) && !cfg.readBoolEntry("onResume", false) |
105 | ) ) | 105 | ) ) |
106 | return; | 106 | return; |
107 | } | 107 | } |
108 | 108 | ||
109 | /** | 109 | /** |
110 | * \li TestNow will ensure that the authentication window will let | 110 | * \li TestNow will ensure that the authentication window will let |
111 | * people escape through the last screen (which they can reach skipping | 111 | * people escape through the last screen (which they can reach skipping |
112 | * all the authentication steps) | 112 | * all the authentication steps) |
113 | * \li LockNow will always go on with the authentication, and won't let | 113 | * \li LockNow will always go on with the authentication, and won't let |
114 | * people escape. | 114 | * people escape. |
115 | */ | 115 | */ |
116 | bool allowByPass = false; | 116 | bool allowByPass = false; |
117 | 117 | ||
118 | if (lockMode == TestNow) | 118 | if (lockMode == TestNow) |
119 | allowByPass = true; | 119 | allowByPass = true; |
120 | 120 | ||
121 | /* Constructs the main window, which displays messages and blocks | 121 | /* Constructs the main window, which displays messages and blocks |
122 | * access to the desktop | 122 | * access to the desktop |
123 | */ | 123 | */ |
124 | MultiauthMainWindow win(allowByPass); | 124 | MultiauthMainWindow win(allowByPass); |
125 | 125 | ||