From cd9b0277016c37724edbdc5fe91d9b745970a044 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Fri, 24 Aug 2012 14:19:51 -0500 Subject: Fixed conflicting LDIF files. During subsystem configuration the ConfigurationUtils.importLDIFS() would generate LDIF files in /conf folder which may conflict with files belonging to other subsystems. The code has been modified to generate the files in //conf folder. Ticket #89 --- .../src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'base/common/src') diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index d63a35b31..987502d4e 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -1183,7 +1183,7 @@ public class ConfigurationUtils { } } catch (Exception e) { e.printStackTrace(); - CMS.debug("Failed to import ldif files" + e); + CMS.debug("Failed to import ldif files: " + e); releaseConnection(conn); throw new IOException("Failed to import ldif files"); } @@ -1202,9 +1202,12 @@ public class ConfigurationUtils { String database = cs.getString("internaldb.database"); String instancePath = cs.getString("instanceRoot"); String instanceId = cs.getString("instanceId"); - String dbuser = "uid=" + cs.getString("cs.type") + "-" + cs.getString("machineName") + "-" + String cstype = cs.getString("cs.type"); + + String dbuser = "uid=" + cstype + "-" + cs.getString("machineName") + "-" + cs.getString("service.securePort") + ",ou=people," + baseDN; - String configDir = instancePath + File.separator + "conf"; + + String configDir = instancePath + File.separator + cstype.toLowerCase() + File.separator + "conf"; StringTokenizer tokenizer = new StringTokenizer(v, ","); while (tokenizer.hasMoreTokens()) { -- cgit