diff options
| author | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-07-23 00:26:22 +0000 |
|---|---|---|
| committer | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-07-23 00:26:22 +0000 |
| commit | 6737a416d8cf688b15ec72a5ca574b0208a4dfc8 (patch) | |
| tree | 43f298417795ecfa22af989a4031e43c642ac3ba /pki/base/common/src/com/netscape/cms/servlet/csadmin | |
| parent | e5f83cbfceeac25ba1cdb532bf327c2f3e389d2f (diff) | |
| download | pki-6737a416d8cf688b15ec72a5ca574b0208a4dfc8.tar.gz pki-6737a416d8cf688b15ec72a5ca574b0208a4dfc8.tar.xz pki-6737a416d8cf688b15ec72a5ca574b0208a4dfc8.zip | |
Bug 608086 - CC: CA, OCSP, and DRM need to add more audit calls
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1130 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin')
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java index 63b0d6595..78c9837c2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java @@ -252,14 +252,19 @@ public class NamePanel extends WizardPanelBase { boolean done = config.getBoolean("preop.NamePanel.done"); c.setDN(dn); } catch (Exception e) { + String instanceId = config.getString("service.instanceID", ""); if (select.equals("clone") || dnUpdated) { c.setDN(dn); } else if (count != 0 && override && (cert.equals("") || certreq.equals(""))) { CMS.debug("NamePanel subsystemCount = "+count); - c.setDN(dn + " "+count+ ((o_sd)? (",O=" + domainname):"")); + c.setDN(dn + " "+count+ + ((!instanceId.equals(""))? (",OU=" + instanceId):"") + + ((o_sd)? (",O=" + domainname):"")); config.putBoolean(PCERT_PREFIX+certTag+".updatedDN", true); } else { - c.setDN(dn + ((o_sd)? (",O=" + domainname):"")); + c.setDN(dn + + ((!instanceId.equals(""))? (",OU=" + instanceId):"") + + ((o_sd)? (",O=" + domainname):"")); config.putBoolean(PCERT_PREFIX+certTag+".updatedDN", true); } } |