shadowlock: disable until proper unit tests are run
Commit 8eb5397b fixed an issue where the shadowlock objects were not
being created or used. That brought to light an issue with the
implementation of that class. For now, comment out the use of the
shadowlock to get us back to where we were prior to the commit and give
us some time to fix it and ensure all tests pass as expected.
See openbmc/phosphor-user-manager#10 for more details.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I570dd6bd3a308e3608525f5e08182c6491fbb7a3
diff --git a/user_mgr.cpp b/user_mgr.cpp
index 5dbc8cc..1b14e8e 100644
--- a/user_mgr.cpp
+++ b/user_mgr.cpp
@@ -300,7 +300,7 @@
throwForInvalidPrivilege(priv);
throwForInvalidGroups(groupNames);
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
throwForUserExists(userName);
throwForUserNameConstraints(userName, groupNames);
throwForMaxGrpUserCount(groupNames);
@@ -346,7 +346,7 @@
void UserMgr::deleteUser(std::string userName)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
throwForUserDoesNotExist(userName);
try
{
@@ -369,7 +369,7 @@
void UserMgr::renameUser(std::string userName, std::string newUserName)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
throwForUserDoesNotExist(userName);
throwForUserExists(newUserName);
throwForUserNameConstraints(newUserName,
@@ -410,7 +410,7 @@
throwForInvalidPrivilege(priv);
throwForInvalidGroups(groupNames);
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
throwForUserDoesNotExist(userName);
const std::vector<std::string>& oldGroupNames =
usersList[userName].get()->userGroups();
@@ -645,7 +645,7 @@
void UserMgr::userEnable(const std::string& userName, bool enabled)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
throwForUserDoesNotExist(userName);
try
{
@@ -678,7 +678,7 @@
bool UserMgr::userLockedForFailedAttempt(const std::string& userName)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
std::vector<std::string> output;
output = executeCmd("/usr/sbin/pam_tally2", "-u", userName.c_str());
@@ -716,7 +716,7 @@
const bool& value)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
std::vector<std::string> output;
if (value == true)
{
@@ -735,7 +735,7 @@
bool UserMgr::userPasswordExpired(const std::string& userName)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
struct spwd spwd
{};
@@ -780,7 +780,7 @@
UserSSHLists UserMgr::getUserAndSshGrpList()
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
std::vector<std::string> userList;
std::vector<std::string> sshUsersList;
@@ -838,7 +838,7 @@
bool UserMgr::isUserEnabled(const std::string& userName)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
std::array<char, 4096> buffer{};
struct spwd spwd;
struct spwd* resultPtr = nullptr;
@@ -1105,7 +1105,7 @@
void UserMgr::initUserObjects(void)
{
// All user management lock has to be based on /etc/shadow
- phosphor::user::shadow::Lock lock{};
+ // TODO phosphor-user-manager#10 phosphor::user::shadow::Lock lock{};
std::vector<std::string> userNameList;
std::vector<std::string> sshGrpUsersList;
UserSSHLists userSSHLists = getUserAndSshGrpList();