Skip to content

Commit

Permalink
fix: AddAccount
Browse files Browse the repository at this point in the history
  • Loading branch information
huerni committed Nov 13, 2024
1 parent af8afb9 commit 0769d33
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/CraneCtld/AccountManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,10 @@ AccountManager::CraneExpected<void> AccountManager::AddAccount(
const User* op_user = user_result.value();
// When creating an account without a parent, the permission level of
// op_user must be Operator or higher.
if (new_account.parent_account.empty()) {
if (new_account.parent_account.empty())
result = CheckIfUserHasHigherPrivThan_(*op_user, User::None);
if (!result) return result;
}
result = CheckIfUserHasPermOnAccountNoLock_(
else
result = CheckIfUserHasPermOnAccountNoLock_(
*op_user, new_account.parent_account, false);
if (!result) return result;
}
Expand Down Expand Up @@ -416,9 +415,8 @@ AccountManager::CraneExpected<void> AccountManager::QueryAccountInfo(
}
} else {
const Account* account = GetAccountInfoNoLock_(name);
if (!account) {
if (!account)
return std::unexpected(CraneErrCode::ERR_INVALID_ACCOUNT);
}
res_account_map->try_emplace(name, *account);
}

Expand Down Expand Up @@ -1373,7 +1371,6 @@ AccountManager::CheckIfUserHasPermOnUserNoLock_(const User& op_user,
op_user.name == user->name)
return {};

CraneExpected<void> result;
for (const auto& [acct, item] : user->account_to_attrs_map) {
if (CheckIfUserHasPermOnAccountNoLock_(op_user, acct, read_only_priv))
return {};
Expand Down

0 comments on commit 0769d33

Please sign in to comment.