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

--
Endi S. Dewata
>From 0409bfa35601a0b59f75c05cf8a34aed6514fc24 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edew...@redhat.com>
Date: Sat, 8 Apr 2017 09:04:54 +0200
Subject: [PATCH] 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
---
 base/java-tools/src/com/netscape/cmstools/group/GroupCLI.java | 3 ++-
 base/java-tools/src/com/netscape/cmstools/user/UserCLI.java   | 3 ++-
 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 5ccf70df54fde2a59123f8147649957ec36af243..95eb3a21d2d82c0c799d66b588f0996a2476a6cc 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 1acbf0b726ac64147daa955b62a542818e180593..affda9cfb2a19a5196d2c5f3455eca3ea626d8fe 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
-- 
2.9.3

_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Reply via email to