CKM: Handle the empty onlycap case properly

In case of empty onlycap the original process label was not restored
properly leading to failures in following tests.

Change-Id: I9e4cdce234b425887da07892773f21465087c4a6

diff --git a/src/common/scoped_process_label.cpp b/src/common/scoped_process_label.cpp
index 47872bcc88e21b3b07d3c121d450cc1401cf95bf..793a6ef6c9f168d7442c5521d92e49bba3c375e1 100644 (file)
--- a/src/common/scoped_process_label.cpp
+++ b/src/common/scoped_process_label.cpp
@@ -122,7 +122,6 @@ ScopedProcessLabel::ScopedProcessLabel(std::string label, bool restore) :
                        newOnlycap.insert(m_label);
                        smackSetOnlycap(newOnlycap);
                } else {
-                       m_originalLabel.clear();
                        m_originalOnlycap.clear();
                }
        }
@@ -135,7 +134,8 @@ ScopedProcessLabel::~ScopedProcessLabel()
        if (!m_originalLabel.empty()) {
                try {
                        smackSetLabelForSelf(m_originalLabel);
-                       smackSetOnlycap(m_originalOnlycap);
+                       if (!m_originalOnlycap.empty())
+                               smackSetOnlycap(m_originalOnlycap);
                } catch (const DPL::Test::TestException& e) {
                        RUNNER_ERROR_MSG("Test exception occurred: " << e.GetMessage());
                } catch (const std::exception& e) {