java/code/src/com/redhat/rhn/common/security/PermissionException.java | 2 +- java/code/src/com/redhat/rhn/common/util/StringUtil.java | 2 +- java/code/webapp/WEB-INF/struts-config.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

New commits: commit 739614b3b5eaec0a034cc6f4876e887dfb101ae1 Author: Tomas Lestach tlestach@redhat.com Date: Wed Aug 29 16:54:56 2012 +0200

allow complex kickstart variables containing severel '='

diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java index 6e75b8c..a7c3b3b 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -713,7 +713,7 @@ public class StringUtil { while (token.hasMoreElements()) { String option = token.nextToken(); if (!StringUtils.isBlank(option)) { //Skip blank lines - String[] args = option.split("="); + String[] args = option.split("=", 2); if (args.length != 2) { ValidatorException.raiseException(errorKey, option); }

commit d2635be3204f12e5f08ba6ea10545dd4e45ab79a Author: Tomas Lestach tlestach@redhat.com Date: Wed Aug 29 11:24:51 2012 +0200

851519 - display a reasonable error message on the permission error page

diff --git a/java/code/src/com/redhat/rhn/common/security/PermissionException.java b/java/code/src/com/redhat/rhn/common/security/PermissionException.java index c09fc15..b3500d3 100644 --- a/java/code/src/com/redhat/rhn/common/security/PermissionException.java +++ b/java/code/src/com/redhat/rhn/common/security/PermissionException.java @@ -68,7 +68,7 @@ public class PermissionException extends RhnRuntimeException { */ public PermissionException(Role role) { this("You do not have permissions to " + - "perform this action. You need to have atleast a " + role.getName() + + "perform this action. You need to have at least a " + role.getName() + " role to perform this action"); // begin member variable initialization } diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 4cef9f2..3dad82e 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -1223,7 +1223,7 @@ path="/WEB-INF/pages/common/errors/badparam.jsp" key="date" handler="com.redhat.rhn.common.errors.BadParameterExceptionHandler"/> <exception type="com.redhat.rhn.common.security.PermissionException" - path="/WEB-INF/pages/common/errors/permission.jsp" key="date" + path="/WEB-INF/pages/common/errors/permission.jsp" key="frontend.actions.channels.manager.add.permsfailure" handler="com.redhat.rhn.common.errors.PermissionExceptionHandler"/> <exception type="com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException" path="/WEB-INF/pages/common/errors/nosuchpkg.jsp" key="date"