diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-09 17:08:23 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-09 17:08:23 +0100 |
| commit | 51fbef0e393de417d66e5827ef4c11dd81ffabb5 (patch) | |
| tree | e8a5ef32b88d888ee93ebff0488f13d4ad21d3b2 /src | |
| parent | b280acef5e151c0d32e828cf04b0cc8c644e2552 (diff) | |
| parent | 4df13ffe0f3b9952dcd68263fb51cac842b193b1 (diff) | |
Merge branch 'master' into rhel6
Diffstat (limited to 'src')
| -rw-r--r-- | src/CLI/report.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index 7ef33ac..6a8f9f4 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -427,12 +427,12 @@ int report(const char *uuid, bool always) // Skip nonReporter plugins. if (0 != strcmp(it->second["Type"].c_str(), "Reporter")) continue; - + map_string_t settings = call_GetPluginSettings(it->first.c_str()); // Login information is missing. - bool loginMissing = settings.find("Login") != settings.end() + bool loginMissing = settings.find("Login") != settings.end() && 0 == strcmp(settings["Login"].c_str(), ""); - bool passwordMissing = settings.find("Password") != settings.end() + bool passwordMissing = settings.find("Password") != settings.end() && 0 == strcmp(settings["Password"].c_str(), ""); if (!loginMissing && !passwordMissing) continue; @@ -461,7 +461,7 @@ int report(const char *uuid, bool always) fgets(answer, sizeof(answer), stdin); if (strlen(answer) > 0) pluginSettings[it->first]["Password"] = answer; - } + } } } @@ -475,7 +475,7 @@ int report(const char *uuid, bool always) vector_string_t &v = it->second; printf("%s: %s\n", it->first.c_str(), v[REPORT_STATUS_IDX_MSG].c_str()); plugins++; - if (v[REPORT_STATUS_IDX_FLAG] != "0") + if (v[REPORT_STATUS_IDX_FLAG] == "0") errors++; it++; } |
