1 files changed, 12 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
index e00f2bdba..3af4099a2 100644
--- a/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
@@ -50,6 +50,18 @@ public class CMSStartServlet extends HttpServlet {
         super.init(config);
         String path = config.getInitParameter(PROP_CMS_CFG);
 
+        if (path == null) {
+            String[] s = config.getServletContext().getContextPath().split("/");
+            if (s.length < 2) {
+                throw new ServletException("Unable to get subsystem from context path");
+            }
+            String subsystem = s[1];
+
+            path = System.getProperty("catalina.base") + File.separator +
+                    "conf" + File.separator +
+                    subsystem + File.separator + "CS.cfg";
+        }
+
         File f = new File(path);
         String old_path = "";
         if (!f.exists()) {