2 files changed, 8 insertions, 26 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
index f01d75c9..32ae0fcc 100644
--- a/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
+++ b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
@@ -20,8 +20,8 @@ package com.netscape.cms.servlet.common;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
+import com.netscape.certsrv.authentication.EAuthException;
 import com.netscape.certsrv.authentication.IAuthCredentials;
-import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IArgBlock;
 
 /**
@@ -52,9 +52,9 @@ public class AuthCredentials implements IAuthCredentials {
      * @param cred credential
      * @exception com.netscape.certsrv.base.EBaseException NullPointerException
      */
-    public void set(String name, Object cred) throws EBaseException {
+    public void set(String name, Object cred) throws EAuthException {
         if (cred == null) {
-            throw new EBaseException("AuthCredentials.set()");
+            throw new EAuthException("AuthCredentials.set()");
         }
 
         authCreds.put(name, cred);
diff --git a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
index 1306b168..a709b6b0 100644
--- a/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
+++ b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
@@ -104,12 +104,10 @@ public class ServletUtils {
         }
     }
 
-    public static String getACLMethod(String id) throws ServletException {
+    public static String getACLMethod(String aclInfo, String authzMgr, String id) throws EBaseException {
         String srcType = AUTHZ_SRC_LDAP;
         IAuthzSubsystem authz = (IAuthzSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_AUTHZ);
 
-        IConfigStore cs = CMS.getConfigStore();
-
         try {
             IConfigStore authzConfig = CMS.getConfigStore().getSubStore(AUTHZ_CONFIG_STORE);
             srcType = authzConfig.getString(AUTHZ_SRC_TYPE, AUTHZ_SRC_LDAP);
@@ -122,31 +120,15 @@ public class ServletUtils {
         if (srcType.equalsIgnoreCase(AUTHZ_SRC_XML)) {
             CMS.debug(CMS.getLogMessage("ADMIN_SRVLT_AUTHZ_INITED", ""));
             try {
-                aclMethod = cs.getString(id + "." + PROP_AUTHZ_MGR);
+                aclMethod = authzMgr;
             } catch (Exception e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }
-            if (aclMethod != null &&
-                    aclMethod.equalsIgnoreCase(AUTHZ_MGR_BASIC)) {
-                String aclInfo = null;
-                try {
-                    aclInfo = cs.getString(id + "." + PROP_ACL);
-                } catch (Exception e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-
+            if (aclMethod != null && aclMethod.equalsIgnoreCase(AUTHZ_MGR_BASIC)) {
                 if (aclInfo != null) {
-                    try {
-                        addACLInfo(authz, aclMethod, aclInfo);
-                    } catch (EBaseException ee) {
-                        throw new ServletException(
-                                "failed to init authz info from xml config file");
-                    }
-
-                    CMS.debug(CMS.getLogMessage("ADMIN_SRVLT_AUTHZ_MGR_INIT_DONE",
-                            id));
+                    addACLInfo(authz, aclMethod, aclInfo);
+                    CMS.debug(CMS.getLogMessage("ADMIN_SRVLT_AUTHZ_MGR_INIT_DONE", id));
                 } else {
                     CMS.debug(CMS.getLogMessage(
                             "ADMIN_SRVLT_PROP_ACL_NOT_SPEC", PROP_ACL, id,