diff --git a/objectstore/CreationLog.hpp b/objectstore/CreationLog.hpp
index e389fa1a90da4318b7a80e0541c5523655c5f44d..55e80c4c5ae403ed3851d7f6c2fb2dd1744804ff 100644
--- a/objectstore/CreationLog.hpp
+++ b/objectstore/CreationLog.hpp
@@ -34,15 +34,15 @@ public:
const std::string & c): cta::CreationLog(
cta::UserIdentity(user),hn ,t, c) {}
void serialize (cta::objectstore::serializers::CreationLog & log) const {
- log.mutable_user()->set_uid(user.getUid());
- log.mutable_user()->set_gid(user.getGid());
+ log.mutable_user()->set_uid(user.uid);
+ log.mutable_user()->set_gid(user.gid);
log.set_host(host);
log.set_time(time);
log.set_comment(comment);
}
void deserialize (const cta::objectstore::serializers::CreationLog & log) {
- user.setUid(log.user().uid());
- user.setGid(log.user().gid());
+ user.uid=log.user().uid();
+ user.gid=log.user().gid();
host = log.host();
time = log.time();
comment = log.comment();
diff --git a/objectstore/UserIdentity.hpp b/objectstore/UserIdentity.hpp
index 4565f89e160cc539359b9a31ca0841af0857a822..0b3f1d5d88059fcd3c94061db5afe0534c5d53cc 100644
--- a/objectstore/UserIdentity.hpp
+++ b/objectstore/UserIdentity.hpp
@@ -18,19 +18,15 @@
#include <string>
#include <stdint.h>
-#include <limits>
#include "objectstore/cta.pb.h"
+#include "scheduler/UserIdentity.hpp"
namespace cta { namespace objectstore {
-class UserIdentity {
+class UserIdentity: public cta::UserIdentity {
public:
- UserIdentity (): uid(std::numeric_limits<decltype(uid)>::max()),
- gid(std::numeric_limits<decltype(gid)>::max()) {}
- UserIdentity (uint32_t ui, uint32_t gi):
- uid(ui), gid(gi) {}
- uint32_t uid;
- uint32_t gid;
+ UserIdentity (): cta::UserIdentity() {}
+ UserIdentity (uint32_t ui, uint32_t gi): cta::UserIdentity(ui, gi) {}
void serialize (cta::objectstore::serializers::UserIdentity & user) const {
user.set_uid(uid);
user.set_gid(gid);
@@ -39,17 +35,6 @@ public:
uid = user.uid();
gid = user.gid();
}
- /**
- * We can compare the UserIdentities between each other, and with the
- * serialized user identities.
- * The current actual criteria is numeric uid equility only.
- */
- bool operator==(const UserIdentity & o) const {
- return uid == o.uid;
- }
- bool operator==(const cta::objectstore::serializers::UserIdentity & o) const {
- return uid == o.uid();
- }
};
}}
diff --git a/scheduler/MockSchedulerDatabase.cpp b/scheduler/MockSchedulerDatabase.cpp
index fd0709837f906b2db0f59c94f3322e06ee159adf..6b6e1b2db81b87f333dd8671a75f178c35266bce 100644
--- a/scheduler/MockSchedulerDatabase.cpp
+++ b/scheduler/MockSchedulerDatabase.cpp
@@ -227,7 +227,7 @@ void cta::MockSchedulerDatabase::queue(const ArchiveToTapeCopyRequest &rqst) {
<< "'PENDING_NS','" << rqst.getRemoteFile() << "','" <<
rqst.getArchiveFile() << "','" << rqst.getTapePoolName() << "'," <<
rqst.getCopyNb() << "," << rqst.getPriority() << "," <<
- requester.getUser().getUid() << "," << requester.getUser().getGid() << ","
+ requester.getUser().uid << "," << requester.getUser().gid << ","
<< (int)time(NULL) << ");";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -472,7 +472,7 @@ void cta::MockSchedulerDatabase::queue(const RetrieveToFileRequest &rqst) {
query << "INSERT INTO RETRIEVEFROMTAPECOPYREQUEST(ARCHIVEFILE, REMOTEFILE, COPYNB, VID, FSEQ, BLOCKID, PRIORITY, UID,"
" GID, HOST, CREATIONTIME) VALUES(" << (int)cta::RetrieveFromTapeCopyRequestState::PENDING <<
",'" << rqst.getArchiveFile() << "','" << rqst.getRemoteFile() << "'," <<
- requester.getUser().getUid() << "," << requester.getUser().getGid() <<
+ requester.getUser().uid << "," << requester.getUser().gid <<
"," << (int)time(NULL) << ");";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -618,13 +618,13 @@ void cta::MockSchedulerDatabase::createAdminUser(
const SecurityIdentity &requester,
const UserIdentity &user,
const std::string &comment) {
- const uint32_t adminUid = user.getUid();
- const uint32_t adminGid = user.getGid();
+ const uint32_t adminUid = user.uid;
+ const uint32_t adminGid = user.gid;
char *zErrMsg = 0;
std::ostringstream query;
query << "INSERT INTO ADMINUSER(ADMIN_UID, ADMIN_GID, UID, GID,"
" CREATIONTIME, COMMENT) VALUES(" << adminUid << "," << adminGid << "," <<
- requester.getUser().getUid() << "," << requester.getUser().getGid() << ","
+ requester.getUser().uid << "," << requester.getUser().gid << ","
<< (int)time(NULL) << ",'" << comment << "');";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -650,8 +650,8 @@ void cta::MockSchedulerDatabase::deleteAdminUser(
const UserIdentity &user) {
char *zErrMsg = 0;
std::ostringstream query;
- query << "DELETE FROM ADMINUSER WHERE ADMIN_UID=" << user.getUid() <<
- " AND ADMIN_GID=" << user.getGid() <<";";
+ query << "DELETE FROM ADMINUSER WHERE ADMIN_UID=" << user.uid <<
+ " AND ADMIN_GID=" << user.gid <<";";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
std::ostringstream msg;
@@ -662,7 +662,7 @@ void cta::MockSchedulerDatabase::deleteAdminUser(
const int nbRowsModified = sqlite3_changes(m_dbHandle);
if(0 >= nbRowsModified) {
std::ostringstream msg;
- msg << "Admin user " << user.getUid() << ":" << user.getGid() <<
+ msg << "Admin user " << user.uid << ":" << user.gid <<
" does not exist";
throw(exception::Exception(msg.str()));
}
@@ -714,8 +714,8 @@ void cta::MockSchedulerDatabase::assertIsAdminOnAdminHost(
//------------------------------------------------------------------------------
void cta::MockSchedulerDatabase::assertIsAdmin(const UserIdentity &user)
const {
- const uint32_t adminUid = user.getUid();
- const uint32_t adminGid = user.getGid();
+ const uint32_t adminUid = user.uid;
+ const uint32_t adminGid = user.gid;
std::ostringstream query;
query << "SELECT COUNT(*) FROM ADMINUSER WHERE ADMIN_UID=" << adminUid <<
" AND ADMIN_GID=" << adminGid << ";";
@@ -777,8 +777,8 @@ void cta::MockSchedulerDatabase::createAdminHost(
char *zErrMsg = 0;
std::ostringstream query;
query << "INSERT INTO ADMINHOST(NAME, UID, GID, CREATIONTIME, COMMENT)"
- " VALUES('" << hostName << "',"<< requester.getUser().getUid() << "," <<
- requester.getUser().getGid() << "," << (int)time(NULL) << ",'" << comment <<
+ " VALUES('" << hostName << "',"<< requester.getUser().uid << "," <<
+ requester.getUser().gid << "," << (int)time(NULL) << ",'" << comment <<
"');";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -861,7 +861,7 @@ void cta::MockSchedulerDatabase::createStorageClass(
std::ostringstream query;
query << "INSERT INTO STORAGECLASS(NAME, NBCOPIES, UID, GID, CREATIONTIME,"
" COMMENT) VALUES('" << name << "'," << (int)nbCopies << "," <<
- requester.getUser().getUid() << "," << requester.getUser().getGid() << "," <<
+ requester.getUser().uid << "," << requester.getUser().gid << "," <<
(int)time(NULL) << ",'" << comment << "');";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -989,7 +989,7 @@ void cta::MockSchedulerDatabase::createTapePool(
std::ostringstream query;
query << "INSERT INTO TAPEPOOL(NAME, NBPARTIALTAPES, UID, GID, CREATIONTIME,"
" COMMENT) VALUES('" << name << "'," << (int)nbPartialTapes << "," <<
- requester.getUser().getUid() << "," << requester.getUser().getGid() << "," <<
+ requester.getUser().uid << "," << requester.getUser().gid << "," <<
(int)time(NULL) << ",'" << comment << "');";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -1080,8 +1080,8 @@ void cta::MockSchedulerDatabase::createArchivalRoute(
std::ostringstream query;
query << "INSERT INTO ARCHIVALROUTE(STORAGECLASS_NAME, COPYNB, TAPEPOOL,"
" UID, GID, CREATIONTIME, COMMENT) VALUES('" << storageClassName << "'," <<
- (int)copyNb << ",'" << tapePoolName << "'," << requester.getUser().getUid() <<
- "," << requester.getUser().getGid() << "," << (int)time(NULL) << ",'" << comment
+ (int)copyNb << ",'" << tapePoolName << "'," << requester.getUser().uid <<
+ "," << requester.getUser().gid << "," << (int)time(NULL) << ",'" << comment
<< "');";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -1240,8 +1240,8 @@ void cta::MockSchedulerDatabase::createLogicalLibrary(
char *zErrMsg = 0;
std::ostringstream query;
query << "INSERT INTO LOGICALLIBRARY(NAME, UID, GID, CREATIONTIME, COMMENT)"
- " VALUES('" << name << "',"<< requester.getUser().getUid() << "," <<
- requester.getUser().getGid() << "," << (int)time(NULL) << ",'" << comment <<
+ " VALUES('" << name << "',"<< requester.getUser().uid << "," <<
+ requester.getUser().gid << "," << (int)time(NULL) << ",'" << comment <<
"');";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
@@ -1323,7 +1323,7 @@ void cta::MockSchedulerDatabase::createTape(
" CAPACITY_BYTES, DATAONTAPE_BYTES, UID, GID, CREATIONTIME, COMMENT)"
" VALUES('" << vid << "','" << logicalLibraryName << "','" << tapePoolName
<< "',"<< (long unsigned int)capacityInBytes << ",0," <<
- requester.getUser().getUid() << "," << requester.getUser().getGid() << ","
+ requester.getUser().uid << "," << requester.getUser().gid << ","
<< (int)time(NULL) << ",'" << comment << "');";
if(SQLITE_OK != sqlite3_exec(m_dbHandle, query.str().c_str(), 0, 0,
&zErrMsg)) {
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 33d0e18f970ac49c3e757218e3b5bf844acb55fc..4b3d79c715331d344efcd6ba7f5e6546da06c105 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -54,7 +54,7 @@ std::list<AdminHost> OStoreDB::getAdminHosts() const {
rel.release();
for (auto h=hl.begin(); h!=hl.end(); h++) {
ret.push_back(AdminHost(h->hostname,
- cta::UserIdentity(h->log.user.getUid(), h->log.user.getGid()),
+ cta::UserIdentity(h->log.user.uid, h->log.user.gid),
h->log.comment, h->log.time));
}
return ret;
@@ -77,7 +77,7 @@ void OStoreDB::createAdminUser(const SecurityIdentity& requester,
re.fetch();
objectstore::CreationLog cl(requester.getUser(), requester.getHost(),
time(NULL), comment);
- re.addAdminUser(objectstore::UserIdentity(user.getUid(), user.getGid()), cl);
+ re.addAdminUser(objectstore::UserIdentity(user.uid, user.gid), cl);
re.commit();
}
@@ -86,7 +86,7 @@ void OStoreDB::deleteAdminUser(const SecurityIdentity& requester,
RootEntry re(m_objectStore);
ScopedExclusiveLock rel(re);
re.fetch();
- re.removeAdminUser(objectstore::UserIdentity(user.getUid(), user.getGid()));
+ re.removeAdminUser(objectstore::UserIdentity(user.uid, user.gid));
re.commit();
}
@@ -100,7 +100,7 @@ std::list<AdminUser> OStoreDB::getAdminUsers() const {
ret.push_back(
AdminUser(
cta::UserIdentity(au->user.uid, au->user.gid),
- cta::UserIdentity(au->log.user.getUid(), au->log.user.getGid()),
+ cta::UserIdentity(au->log.user.uid, au->log.user.gid),
au->log.comment,
au->log.time
));
@@ -113,11 +113,11 @@ void OStoreDB::assertIsAdminOnAdminHost(const SecurityIdentity& id) const {
RootEntry re(m_objectStore);
ScopedSharedLock rel(re);
re.fetch();
- if (!re.isAdminUser(objectstore::UserIdentity(id.getUser().getUid(),
- id.getUser().getGid()))) {
+ if (!re.isAdminUser(objectstore::UserIdentity(id.getUser().uid,
+ id.getUser().gid))) {
std::ostringstream msg;
- msg << "User uid=" << id.getUser().getUid()
- << " gid=" << id.getUser().getGid()
+ msg << "User uid=" << id.getUser().uid
+ << " gid=" << id.getUser().gid
<< " is not an administrator";
throw exception::Exception(msg.str());
}
@@ -146,7 +146,7 @@ StorageClass OStoreDB::getStorageClass(const std::string& name) const {
auto sc = re.dumpStorageClass(name);
return cta::StorageClass(name,
sc.copyCount,
- cta::UserIdentity(sc.log.user.getUid(), sc.log.user.getGid()),
+ cta::UserIdentity(sc.log.user.uid, sc.log.user.gid),
sc.log.comment,
sc.log.time);
}
diff --git a/scheduler/UserIdentity.cpp b/scheduler/UserIdentity.cpp
index 5341f7dfd3fabdd5e91b03c26b37e754d3060b2e..b421676411b2d8198e11f5f2c1cf970848a6ff6d 100644
--- a/scheduler/UserIdentity.cpp
+++ b/scheduler/UserIdentity.cpp
@@ -24,24 +24,24 @@
// constructor
//------------------------------------------------------------------------------
cta::UserIdentity::UserIdentity() throw():
- m_uid(std::numeric_limits<decltype(m_uid)>::max()),
- m_gid(std::numeric_limits<decltype(m_gid)>::max()) {}
+ uid(std::numeric_limits<decltype(uid)>::max()),
+ gid(std::numeric_limits<decltype(gid)>::max()) {}
//------------------------------------------------------------------------------
// constructor
//------------------------------------------------------------------------------
cta::UserIdentity::UserIdentity(
- const uint32_t uid,
- const uint32_t gid) throw():
- m_uid(uid),
- m_gid(gid) {
+ const uint32_t u,
+ const uint32_t g) throw():
+ uid(u),
+ gid(g) {
}
//------------------------------------------------------------------------------
// operator==
//------------------------------------------------------------------------------
bool cta::UserIdentity::operator==(const UserIdentity &rhs) const {
- return m_uid == rhs.m_uid;
+ return uid == rhs.uid;
}
//------------------------------------------------------------------------------
@@ -51,38 +51,10 @@ bool cta::UserIdentity::operator!=(const UserIdentity &rhs) const {
return !operator==(rhs);
}
-//------------------------------------------------------------------------------
-// setUid
-//------------------------------------------------------------------------------
-void cta::UserIdentity::setUid(const uint32_t uid) throw() {
- m_uid = uid;
-}
-
-//------------------------------------------------------------------------------
-// getUid
-//------------------------------------------------------------------------------
-uint32_t cta::UserIdentity::getUid() const throw() {
- return m_uid;
-}
-
-//------------------------------------------------------------------------------
-// setGid
-//------------------------------------------------------------------------------
-void cta::UserIdentity::setGid(const uint32_t gid) throw() {
- m_gid = gid;
-}
-
-//------------------------------------------------------------------------------
-// getGid
-//------------------------------------------------------------------------------
-uint32_t cta::UserIdentity::getGid() const throw() {
- return m_gid;
-}
-
//------------------------------------------------------------------------------
// operator<<
//------------------------------------------------------------------------------
std::ostream &operator<<(std::ostream &os, const cta::UserIdentity &obj) {
- os << "(uid=" << obj.getUid() << " gid=" << obj.getGid() << ")";
+ os << "(uid=" << obj.uid << " gid=" << obj.gid << ")";
return os;
}
diff --git a/scheduler/UserIdentity.hpp b/scheduler/UserIdentity.hpp
index 329bcf8bbf8d12773031260e77e092d1a1c2f98f..71e051c501b984fd45be3a64e328f553a3d14048 100644
--- a/scheduler/UserIdentity.hpp
+++ b/scheduler/UserIdentity.hpp
@@ -44,30 +44,6 @@ public:
*/
UserIdentity(const uint32_t uid, const uint32_t gid) throw();
- /**
- * Sets the user ID of the user.
- *
- * @param uid The user ID of the user.
- */
- void setUid(const uint32_t uid) throw();
-
- /**
- * Returns the user ID of the user.
- */
- uint32_t getUid() const throw();
-
- /**
- * Sets the group ID of the user.
- *
- * @param gid The group ID of the user.
- */
- void setGid(const uint32_t gid) throw();
-
- /**
- * Returns the group ID of the user.
- */
- uint32_t getGid() const throw();
-
/**
* Returns true if the specified right-hand side is equal to this object.
*
@@ -84,17 +60,15 @@ public:
*/
bool operator!=(const UserIdentity &rhs) const;
-private:
-
/**
* The user ID of the user.
*/
- uint32_t m_uid;
+ uint32_t uid;
/**
* The group ID of the user.
*/
- uint32_t m_gid;
+ uint32_t gid;
}; // class UserIdentity
diff --git a/xroot_plugins/XrdProFilesystem.cpp b/xroot_plugins/XrdProFilesystem.cpp
index b910ca287fccf6d1e7b1ec2144934c99dd6a033f..d24799e4c68fbfd68d2b122b44b9e705541bf492 100644
--- a/xroot_plugins/XrdProFilesystem.cpp
+++ b/xroot_plugins/XrdProFilesystem.cpp
@@ -191,8 +191,8 @@ int XrdProFilesystem::executeLsArchiveJobsCommand(const ParsedRequest &req, XrdO
std::ostringstream responseSS;
responseSS << "[OK] List of archive requests for tape pool " << req.args.at(0) << ":\n";
for(auto it = requests.begin(); it != requests.end(); it++) {
- responseSS << "[OK]\t" << it->getRequester().getUser().getUid()
- << " " << it->getRequester().getUser().getGid()
+ responseSS << "[OK]\t" << it->getRequester().getUser().uid
+ << " " << it->getRequester().getUser().gid
<< " " << it->getCreationTime()
<< " " << it->getRemoteFile()
<< " " << it->getArchiveFile()
@@ -207,8 +207,8 @@ int XrdProFilesystem::executeLsArchiveJobsCommand(const ParsedRequest &req, XrdO
for(auto pool=pools.begin(); pool!=pools.end(); pool++) {
responseSS << "[OK] List of archive requests for tape pool " << (pool->first).getName() << ":\n";
for(auto it = (pool->second).begin(); it != (pool->second).end(); it++) {
- responseSS << "[OK]\t" << it->getRequester().getUser().getUid()
- << " " << it->getRequester().getUser().getGid()
+ responseSS << "[OK]\t" << it->getRequester().getUser().uid
+ << " " << it->getRequester().getUser().gid
<< " " << it->getCreationTime()
<< " " << it->getRemoteFile()
<< " " << it->getArchiveFile()
@@ -292,8 +292,8 @@ int XrdProFilesystem::executeLsRetrieveJobsCommand(const ParsedRequest &req, Xrd
std::ostringstream responseSS;
responseSS << "[OK] List of retrieve requests for vid " << req.args.at(0) << ":\n";
for(auto it = requests.begin(); it != requests.end(); it++) {
- responseSS << "[OK]\t" << it->getRequester().getUser().getUid()
- << " " << it->getRequester().getUser().getGid()
+ responseSS << "[OK]\t" << it->getRequester().getUser().uid
+ << " " << it->getRequester().getUser().gid
<< " " << it->getCreationTime()
<< " " << it->getArchiveFile()
<< " " << it->getCopyNb()
@@ -308,8 +308,8 @@ int XrdProFilesystem::executeLsRetrieveJobsCommand(const ParsedRequest &req, Xrd
for(auto tape=tapes.begin(); tape!=tapes.end(); tape++) {
responseSS << "[OK] List of retrieve requests for vid " << (tape->first).getVid() << ":\n";
for(std::list<cta::RetrieveFromTapeCopyRequest>::const_iterator it = (tape->second).begin(); it != (tape->second).end(); it++) {
- responseSS << "[OK]\t" << it->getRequester().getUser().getUid()
- << " " << it->getRequester().getUser().getGid()
+ responseSS << "[OK]\t" << it->getRequester().getUser().uid
+ << " " << it->getRequester().getUser().gid
<< " " << it->getCreationTime()
<< " " << it->getArchiveFile()
<< " " << it->getCopyNb()
@@ -519,7 +519,7 @@ int XrdProFilesystem::executeLsclassCommand(const ParsedRequest &req, XrdOucErrI
responseSS << "[OK] Listing of the storage class names and no of copies:";
for(std::list<cta::StorageClass>::iterator it = stgList.begin(); it != stgList.end(); it++) {
responseSS << "\n" << it->getName() << " " << it->getNbCopies() << " "
- << it->getCreator().getUid() << " " << it->getCreator().getGid() << " "
+ << it->getCreator().uid << " " << it->getCreator().gid << " "
<< it->getCreationTime() << " \"" << it->getComment() << "\"";
}
eInfo.setErrInfo(responseSS.str().length()+1, responseSS.str().c_str());
@@ -736,7 +736,7 @@ int XrdProFilesystem::executeLspoolCommand(const ParsedRequest &req, XrdOucErrIn
std::ostringstream responseSS;
responseSS << "[OK] Listing of the tape pools:";
for(std::list<cta::TapePool>::iterator it = poolList.begin(); it != poolList.end(); it++) {
- responseSS << "\n" << it->getName() << " " << it->getCreator().getUid() << " " << it->getCreator().getGid() << " "
+ responseSS << "\n" << it->getName() << " " << it->getCreator().uid << " " << it->getCreator().gid << " "
<< it->getCreationTime() << " \"" << it->getComment() << "\"";
}
eInfo.setErrInfo(responseSS.str().length()+1, responseSS.str().c_str());
@@ -844,8 +844,8 @@ int XrdProFilesystem::executeLsrouteCommand(const ParsedRequest &req, XrdOucErrI
for(std::list<cta::ArchivalRoute>::iterator it = routeList.begin(); it != routeList.end(); it++) {
responseSS << "\n" << it->getStorageClassName() << ":" << it->getCopyNb()
<< " " << it->getTapePoolName()
- << " " << it->getCreator().getUid()
- << " " << it->getCreator().getGid()
+ << " " << it->getCreator().uid
+ << " " << it->getCreator().gid
<< " \"" << it->getComment() << "\"";
}
eInfo.setErrInfo(responseSS.str().length()+1, responseSS.str().c_str());
@@ -946,8 +946,8 @@ int XrdProFilesystem::executeLsllibCommand(const ParsedRequest &req, XrdOucErrIn
responseSS << "[OK] Listing of the logical libraries:";
for(std::list<cta::LogicalLibrary>::iterator it = llibs.begin(); it != llibs.end(); it++) {
responseSS << "\n" << it->getName()
- << " " << it->getCreator().getUid()
- << " " << it->getCreator().getGid()
+ << " " << it->getCreator().uid
+ << " " << it->getCreator().gid
<< " " << it->getCreationTime()
<< " \"" << it->getComment() << "\"";
}
@@ -1056,8 +1056,8 @@ int XrdProFilesystem::executeLstapeCommand(const ParsedRequest &req, XrdOucErrIn
<< " " << it->getDataOnTapeInBytes()
<< " " << it->getLogicalLibraryName()
<< " " << it->getTapePoolName()
- << " " << it->getCreator().getUid()
- << " " << it->getCreator().getGid()
+ << " " << it->getCreator().uid
+ << " " << it->getCreator().gid
<< " " << it->getCreationTime()
<< " \"" << it->getComment() << "\"";
}
@@ -1094,11 +1094,11 @@ int XrdProFilesystem::executeMkadminuserCommand(const ParsedRequest &req, XrdOuc
std::istringstream i0(req.args.at(0));
int uid = 0;
i0 >> uid;
- adminUser.setUid(uid);
+ adminUser.uid = uid;
std::istringstream i1(req.args.at(1));
int gid = 0;
i1 >> gid;
- adminUser.setGid(gid);
+ adminUser.gid = gid;
const std::string comment = "TO BE DONE";
m_scheduler->createAdminUser(requester, adminUser, comment);
std::ostringstream responseSS;
@@ -1136,11 +1136,11 @@ int XrdProFilesystem::executeRmadminuserCommand(const ParsedRequest &req, XrdOuc
std::stringstream ssArg0(req.args.at(0));
int uid = 0;
ssArg0 >> uid;
- adminUser.setUid(uid);
+ adminUser.uid = uid;
std::stringstream ssArg1(req.args.at(1));
int gid = 0;
ssArg0 >> gid;
- adminUser.setGid(gid);
+ adminUser.gid = gid;
m_scheduler->deleteAdminUser(requester, adminUser);
std::ostringstream responseSS;
responseSS << "[OK] Admin user with uid " << req.args.at(0) << " and gid " << req.args.at(1) << " deleted";
@@ -1177,7 +1177,7 @@ int XrdProFilesystem::executeLsadminuserCommand(const ParsedRequest &req, XrdOuc
std::ostringstream responseSS;
responseSS << "[OK] Listing of the admin user uids and gids:";
for(std::list<cta::AdminUser>::iterator it = userIdList.begin(); it != userIdList.end(); it++) {
- responseSS << "\n" << it->getUser().getUid() << " " << it->getUser().getGid();
+ responseSS << "\n" << it->getUser().uid << " " << it->getUser().gid;
}
eInfo.setErrInfo(responseSS.str().length()+1, responseSS.str().c_str());
return SFS_DATA;