diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2012-08-16 20:09:20 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-08-17 15:07:19 -0700 |
commit | aaebc76f590a31f6dc44efa98dba950985dc6dd2 (patch) | |
tree | 4c9c653cec8f5841b9c0c56be322762e2744aed1 /base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java | |
parent | 6028b01f64305eda7540cf96bde658d4ebbec2ed (diff) | |
download | pki-aaebc76f590a31f6dc44efa98dba950985dc6dd2.tar.gz pki-aaebc76f590a31f6dc44efa98dba950985dc6dd2.tar.xz pki-aaebc76f590a31f6dc44efa98dba950985dc6dd2.zip |
PKI Deployment Scriptlets
* TRAC Ticket #266 - for non-master CA subsystems, pkidestroy needs to
contact the security domain to update the domain
* Made Fedora 17 rely upon tomcatjss 7.0.0 or later
* Changed Dogtag 10 build-time and runtime requirements for 'pki-deploy'
* Altered PKI Package Dependency Chain (top-to-bottom):
pki-ca, pki-kra, pki-ocsp, pki-tks --> pki-deploy --> pki-common
* Changed TPS to require a build-time dependency of 'httpd-devel >= 2.4.2'
* Clarified RPM build script's usage message
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index fe6507f37..b783c359b 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -213,13 +213,16 @@ public class UpdateDomainXML extends CMSServlet { authToken = authenticate(cmsReq); } catch (Exception e) { log(ILogger.LL_FAILURE, - CMS.getLogMessage("ADMIN_SRVLT_AUTH_FAILURE", e.toString())); - outputError(httpResp, AUTH_FAILURE, "Error: Not authenticated"); + CMS.getLogMessage("CMSGW_ERR_BAD_SERV_OUT_STREAM", "", + e.toString())); + outputError(httpResp, AUTH_FAILURE, "Error: Not authenticated", + null); return; } if (authToken == null) { CMS.debug("UpdateDomainXML process: authToken is null"); - outputError(httpResp, AUTH_FAILURE, "Error: not authenticated"); + outputError(httpResp, AUTH_FAILURE, "Error: not authenticated", + null); return; } CMS.debug("UpdateDomainXML process: authentication done"); @@ -232,19 +235,18 @@ public class UpdateDomainXML extends CMSServlet { } catch (EAuthzAccessDenied e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_AUTH_FAILURE", e.toString())); - outputError(httpResp, AUTH_FAILURE, "Error: Not authorized"); + outputError(httpResp, "Error: Not authorized"); return; } catch (Exception e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_AUTH_FAILURE", e.toString())); outputError(httpResp, - AUTH_FAILURE, "Error: Encountered problem during authorization."); return; } if (authzToken == null) { CMS.debug("UpdateDomainXML process: authorization error"); - outputError(httpResp, AUTH_FAILURE, "Error: Not authorized"); + outputError(httpResp, "Error: Not authorized"); return; } |