From 60cebe7b75f556cc5a3f8642811ff36ea230f12d Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Thu, 26 Sep 2019 13:51:46 +0200
Subject: [PATCH] Renamed TapeLsItem::encryption_key to encryption_key_name
---
cmdline/CtaAdminTextFormatter.cpp | 2 +-
xroot_plugins/XrdCtaTapeLs.hpp | 2 +-
xrootd-ssi-protobuf-interface | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmdline/CtaAdminTextFormatter.cpp b/cmdline/CtaAdminTextFormatter.cpp
index 7a0b23a747..1194252040 100644
--- a/cmdline/CtaAdminTextFormatter.cpp
+++ b/cmdline/CtaAdminTextFormatter.cpp
@@ -814,7 +814,7 @@ void TextFormatter::print(const TapeLsItem &tals_item) {
tals_item.logical_library(),
tals_item.tapepool(),
tals_item.vo(),
- tals_item.encryption_key(),
+ tals_item.encryption_key_name(),
dataSizeToStr(tals_item.capacity()),
dataSizeToStr(tals_item.occupancy()),
tals_item.last_fseq(),
diff --git a/xroot_plugins/XrdCtaTapeLs.hpp b/xroot_plugins/XrdCtaTapeLs.hpp
index 3a97f68638..06f82f2c31 100644
--- a/xroot_plugins/XrdCtaTapeLs.hpp
+++ b/xroot_plugins/XrdCtaTapeLs.hpp
@@ -103,7 +103,7 @@ int TapeLsStream::fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf) {
tape_item->set_logical_library(tape.logicalLibraryName);
tape_item->set_tapepool(tape.tapePoolName);
tape_item->set_vo(tape.vo);
- tape_item->set_encryption_key((bool)tape.encryptionKeyName ? tape.encryptionKeyName.value() : "-");
+ tape_item->set_encryption_key_name((bool)tape.encryptionKeyName ? tape.encryptionKeyName.value() : "-");
tape_item->set_capacity(tape.capacityInBytes);
tape_item->set_occupancy(tape.dataOnTapeInBytes);
tape_item->set_last_fseq(tape.lastFSeq);
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index e40c45028c..f26ceb39dc 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit e40c45028c42a208cfd820fb8eec598314a35c23
+Subproject commit f26ceb39dc778055405a276e626b7d8f01404fa5
--
GitLab