diff options
| author | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-04-12 15:58:23 +0000 |
|---|---|---|
| committer | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-04-12 15:58:23 +0000 |
| commit | 8695e79b45cf3d5e1c642e5bcc43a84f76bc5eee (patch) | |
| tree | cb9fddb4efc99969fba5b26ff6367b09e20d6329 | |
| parent | ecdcabc5edbfddedf91cc0f5db437a4dd808bedd (diff) | |
| download | pki-8695e79b45cf3d5e1c642e5bcc43a84f76bc5eee.tar.gz pki-8695e79b45cf3d5e1c642e5bcc43a84f76bc5eee.tar.xz pki-8695e79b45cf3d5e1c642e5bcc43a84f76bc5eee.zip | |
Bugzilla BZ694569: pkiremove parameter not updated - additional fix
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1958 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index b379a789..6de31428 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -334,7 +334,12 @@ public class UpdateDomainXML extends CMSServlet { if ((operation != null) && (operation.equals("remove"))) { status = remove_from_ldap(dn); - String adminUserDN = "uid=" + type + "-" + host + "-" + agentsport + ",ou=People," + basedn; + String adminUserDN; + if ((agentsport != null) && (!agentsport.equals(""))) { + adminUserDN = "uid=" + type + "-" + host + "-" + agentsport + ",ou=People," + basedn; + } else { + adminUserDN = "uid=" + type + "-" + host + "-" + sport + ",ou=People," + basedn; + } if (status.equals(SUCCESS)) { // remove the client cert for this subsystem's admin status = remove_from_ldap(adminUserDN); |