Skip to content

Commit

Permalink
[irods#7380] Fix user_administration library to account for new API c…
Browse files Browse the repository at this point in the history
…hanges
  • Loading branch information
FifthPotato authored and alanking committed Mar 22, 2024
1 parent 8bf8637 commit 55e8a22
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions lib/administration/user/src/user_administration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include "irods/irods_query.hpp"
#include "irods/query_builder.hpp"
#include "irods/version.hpp"

namespace irods::experimental::administration::NAMESPACE_IMPL
{
Expand Down Expand Up @@ -102,10 +103,14 @@ namespace irods::experimental::administration::NAMESPACE_IMPL
auto remove_group(RxComm& _comm, const group& _group) -> void
{
const auto zone = get_local_zone(_comm);

GeneralAdminInput input{};
input.arg0 = "rm";
input.arg1 = "user";
#ifdef IRODS_USER_ADMINISTRATION_ENABLE_SERVER_SIDE_API
input.arg1 = "group";
#else
const auto version = irods::to_version(_comm.svrVersion->relVersion);
input.arg1 = (version && version.value() > irods::version{4, 3, 1}) ? "group" : "user";
#endif
input.arg2 = _group.name.data();
input.arg3 = zone.data();

Expand Down

0 comments on commit 55e8a22

Please sign in to comment.