← Back to branch summary

~ps-jenkins/signon/trusty-proposed

« back to all changes in this revision

Viewing changes to src/signond/credentialsaccessmanager.cpp

  • Committer: Tarmac
  • Author(s): Alberto Mardegan
  • Date: 2013-11-05 20:38:51 UTC
  • mfrom: (602.1.5 packaging)
  • Revision ID: tarmac-20131105203851-gpx2jim3hi22dte5
Merge from upstream: remove the need of distro patches. Fixes: https://bugs.launchpad.net/bugs/1156776, https://bugs.launchpad.net/bugs/1237782.

Approved by PS Jenkins bot, Ken VanDine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/signond/credentialsaccessmanager.cpp
91
91
 
92
92
QString CAMConfiguration::cryptoManagerName() const
93
93
{
94
 
    return m_settings.value(QLatin1String("CryptoManager"),
95
 
                            QLatin1String("default")).toString();
 
94
    return m_settings.value(QLatin1String("CryptoManager")).toString();
96
95
}
97
96
 
98
97
QString CAMConfiguration::accessControlManagerName() const
99
98
{
100
 
    return m_settings.value(QLatin1String("AccessControlManager"),
101
 
                            QLatin1String("default")).toString();
 
99
    return m_settings.value(QLatin1String("AccessControlManager")).toString();
102
100
}
103
101
 
104
102
bool CAMConfiguration::useEncryption() const
108
106
 
109
107
QString CAMConfiguration::secretsStorageName() const
110
108
{
111
 
    return m_settings.value(QLatin1String("SecretsStorage"),
112
 
                            QLatin1String("default")).toString();
 
109
    return m_settings.value(QLatin1String("SecretsStorage")).toString();
113
110
}
114
111
 
115
112
void CAMConfiguration::setStoragePath(const QString &storagePath) {
197
194
 
198
195
    if (m_secretsStorage == 0) {
199
196
        QString name = m_CAMConfiguration.secretsStorageName();
200
 
        if (name != QLatin1String("default")) {
 
197
        if (!name.isEmpty() && name != QLatin1String("default")) {
201
198
            BLAME() << "Couldn't load SecretsStorage:" << name;
202
199
        }
203
200
        TRACE() << "No SecretsStorage set, using default (dummy)";
207
204
    //Initialize AccessControlManager
208
205
    if (m_acManager == 0) {
209
206
        QString name = m_CAMConfiguration.accessControlManagerName();
210
 
        if (name != QLatin1String("default")) {
 
207
        if (!name.isEmpty() && name != QLatin1String("default")) {
211
208
            BLAME() << "Couldn't load AccessControlManager:" << name;
212
209
        }
213
210
        TRACE() << "No AccessControlManager set, using default (dummy)";
222
219
    //Initialize CryptoManager
223
220
    if (m_cryptoManager == 0) {
224
221
        QString name = m_CAMConfiguration.cryptoManagerName();
225
 
        if (name != QLatin1String("default")) {
 
222
        if (!name.isEmpty() && name != QLatin1String("default")) {
226
223
            BLAME() << "Couldn't load CryptoManager:" << name;
227
224
        }
228
225
        TRACE() << "No CryptoManager set, using default (dummy)";
327
324
    if (extension3 != 0) {
328
325
        /* Instantiate this plugin's CryptoManager only if it's the plugin
329
326
         * requested in the config file. */
330
 
        if (plugin->objectName() == m_CAMConfiguration.cryptoManagerName()) {
 
327
        if (m_CAMConfiguration.cryptoManagerName().isEmpty() ||
 
328
            plugin->objectName() == m_CAMConfiguration.cryptoManagerName()) {
331
329
            SignOn::AbstractCryptoManager *cryptoManager =
332
330
                extension3->cryptoManager(this);
333
331
            if (cryptoManager != 0) {
342
340
        }
343
341
 
344
342
        if (m_CAMConfiguration.secretsStorageName().isEmpty() ||
345
 
                plugin->objectName() == m_CAMConfiguration.secretsStorageName()) {
 
343
            plugin->objectName() == m_CAMConfiguration.secretsStorageName()) {
346
344
            SignOn::AbstractSecretsStorage *secretsStorage =
347
345
                extension3->secretsStorage(this);
348
346
            if (secretsStorage != 0) {
358
356
 
359
357
        /* Instantiate this plugin's AccessControlManager only if it's the
360
358
         * plugin requested in the config file. */
361
 
        if (plugin->objectName() ==
 
359
        if (m_CAMConfiguration.accessControlManagerName().isEmpty() ||
 
360
            plugin->objectName() ==
362
361
            m_CAMConfiguration.accessControlManagerName()) {
363
362
            SignOn::AbstractAccessControlManager *acManager =
364
363
                extension3->accessControlManager(this);