summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2017-04-08 09:04:54 +0200
committerEndi S. Dewata <edewata@redhat.com>2017-04-10 16:31:56 +0200
commit0409bfa35601a0b59f75c05cf8a34aed6514fc24 (patch)
treeeec3f68786bef31aafc941eb0d0cd37c65531147
parent60f0adb9205d5c7d4d9294ca620530ff3df2000e (diff)
Fixed pki user and group commands.
The UserCLI and GroupCLI have been fixed to use the subsystem name in the client configuration object if available. https://pagure.io/dogtagpki/issue/2626 Change-Id: Ibf099cefe880a238468fad7fb2aabc9cc2d55c1f
-rw-r--r--base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java3
-rw-r--r--base/java-tools/src/com/netscape/cmstools/user/UserCLI.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java
index 5ccf70df5..95eb3a21d 100644
--- a/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java
@@ -73,7 +73,8 @@ public class GroupCLI extends CLI {
SubsystemCLI subsystemCLI = (SubsystemCLI)parent;
subsystem = subsystemCLI.getName();
} else {
- subsystem = "ca";
+ subsystem = client.getSubsystem();
+ if (subsystem == null) subsystem = "ca";
}
// create new group client
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java
index 1acbf0b72..affda9cfb 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserCLI.java
@@ -76,7 +76,8 @@ public class UserCLI extends CLI {
SubsystemCLI subsystemCLI = (SubsystemCLI)parent;
subsystem = subsystemCLI.getName();
} else {
- subsystem = "ca";
+ subsystem = client.getSubsystem();
+ if (subsystem == null) subsystem = "ca";
}
// create new user client