diff options
author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-12-22 22:19:56 +0000 |
---|---|---|
committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-12-22 22:19:56 +0000 |
commit | 1de788a3ad7296a1068d851d626fb5254b35bd6c (patch) | |
tree | 669bb8894d693f687ab61e3000355fae0ac8ca91 /pki/base/common/src/com/netscape/cms/servlet/csadmin | |
parent | ca5a1664cab0a0cd993936c3c5486c8412cceebe (diff) | |
download | pki-1de788a3ad7296a1068d851d626fb5254b35bd6c.tar.gz pki-1de788a3ad7296a1068d851d626fb5254b35bd6c.tar.xz pki-1de788a3ad7296a1068d851d626fb5254b35bd6c.zip |
BZ547527 - dogtag does not work with latest 389 DS - fix small bug
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@903 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/UpdateDomainXML.java | 31 |
1 files changed, 14 insertions, 17 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 9f2838b8..04d6abf1 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 @@ -252,7 +252,7 @@ public class UpdateDomainXML extends CMSServlet { String operation = httpReq.getParameter("operation"); // ensure required parameters are present - // especially important for DS schema checking + // especially important for DS syntax checking String missing = ""; if ((host == null) || host.equals("")) { missing += " host "; @@ -263,18 +263,6 @@ public class UpdateDomainXML extends CMSServlet { if ((sport == null) || sport.equals("")) { missing += " sport "; } - if ((agentsport == null) || agentsport.equals("")) { - missing += " agentsport "; - } - if ((adminsport == null) || adminsport.equals("")) { - missing += " adminsport "; - } - if ((httpport == null) || httpport.equals("")) { - missing += " httpport "; - } - if ((domainmgr == null) || domainmgr.equals("")) { - missing += " domainmgr "; - } if ((clone == null) || clone.equals("")) { clone = "false"; } @@ -316,10 +304,19 @@ public class UpdateDomainXML extends CMSServlet { attrs.add(new LDAPAttribute("cn", cn)); attrs.add(new LDAPAttribute("Host", host)); attrs.add(new LDAPAttribute("SecurePort", sport)); - attrs.add(new LDAPAttribute("SecureAgentPort", agentsport)); - attrs.add(new LDAPAttribute("SecureAdminPort", adminsport)); - attrs.add(new LDAPAttribute("UnSecurePort", httpport)); - attrs.add(new LDAPAttribute("DomainManager", domainmgr)); + + if ((agentsport != null) && (!agentsport.equals(""))) { + attrs.add(new LDAPAttribute("SecureAgentPort", agentsport)); + } + if ((adminsport != null) && (!adminsport.equals(""))) { + attrs.add(new LDAPAttribute("SecureAdminPort", adminsport)); + } + if ((httpport != null) && (!httpport.equals(""))) { + attrs.add(new LDAPAttribute("UnSecurePort", httpport)); + } + if ((domainmgr != null) && (!domainmgr.equals(""))) { + attrs.add(new LDAPAttribute("DomainManager", domainmgr)); + } attrs.add(new LDAPAttribute("clone", clone)); attrs.add(new LDAPAttribute("SubsystemName", name)); entry = new LDAPEntry(dn, attrs); |