Fix buildbreak caused by improper rebase

Refactoring commit has been improperly rebased which led to buildbreak.

Change-Id: I2d04143cf1eb929c8f8226826336b2e825996149

diff --git a/tools/ckm_db_tool/ckm_db_merge.cpp b/tools/ckm_db_tool/ckm_db_merge.cpp
index 17e308c..fe82bb7 100644 (file)
--- a/tools/ckm_db_tool/ckm_db_merge.cpp
+++ b/tools/ckm_db_tool/ckm_db_merge.cpp
@@ -44,7 +44,7 @@ bool printRow(const DB::Row &row) {
        }
        cout << "Read row:";
        cout << "\n   Name:                  " << row.name;
-       cout << "\n   Owner:                 " << row.ownerLabel;
+       cout << "\n   Owner:                 " << row.owner;
        cout << "\n   Exportable:            " << row.exportable;
        cout << "\n   Alg type:              " << static_cast<int>(row.algorithmType);
        cout << "\n   Enc schema:            " << row.encryptionScheme;
@@ -158,7 +158,7 @@ int main(int argc, char *argv[]) {
                                break;
                        case 'o':
                                owner = optarg; // I cannot pass optarg to lambda because it's pointer
-                               filters.push_back([=](DB::Row &row) {row.ownerLabel = owner; return true;});
+                               filters.push_back([=](DB::Row &row) {row.owner = owner; return true;});
                                break;
                        case 'h':
                                printUsage();