diff options
author | Ade Lee <alee@redhat.com> | 2012-02-29 23:31:15 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-03-09 01:55:38 -0500 |
commit | 87585b101172461d2ad175515154a3f4dbdcd089 (patch) | |
tree | ffd2b86f8a5ee724a4957972850445ebfc00d017 /pki/base/util/src/com | |
parent | a4942509ef7bca864df619a94b90d05cf2204114 (diff) | |
download | pki-87585b101172461d2ad175515154a3f4dbdcd089.tar.gz pki-87585b101172461d2ad175515154a3f4dbdcd089.tar.xz pki-87585b101172461d2ad175515154a3f4dbdcd089.zip |
Fixes to cloning and security domain tables for client auth internaldb user
The mechanism for getting an ldap connection to the internaldb was incorrect,
both in the Security Domain Session Table and the DatabasePanel. As a result,
connections to the internaldb failed for accessing the security domain session
table and when trying to clone a master which connects to its database using
client auth.
The thread that handles reading the security domain session table is now only
instantiated when running on a configured security domain master.
Additionally, needed acls for the client auth certificate ldap user have been
moved to manager.ldif. This includes acls to allow creation and management of
replication agreements and replication users (now being created under
ou=csusers, cn=config)
Added logs to show when ldif import errors occur. Also made sure to write and
remove master ldap password for use in replication.
Ticket #5
Diffstat (limited to 'pki/base/util/src/com')
-rw-r--r-- | pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java b/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java index 132e65e6c..a78f8ac55 100644 --- a/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java @@ -18,6 +18,7 @@ package com.netscape.cmsutil.ldap; import java.io.IOException; +import java.util.ArrayList; import netscape.ldap.LDAPAttribute; import netscape.ldap.LDAPAttributeSet; @@ -32,7 +33,7 @@ import netscape.ldap.util.LDIFModifyContent; import netscape.ldap.util.LDIFRecord; public class LDAPUtil { - public static void importLDIF(LDAPConnection conn, String filename) throws IOException { + public static void importLDIF(LDAPConnection conn, String filename, ArrayList<String> errors) throws IOException { LDIF ldif = new LDIF(filename); while (true) { try { @@ -53,6 +54,8 @@ public class LDAPUtil { try { conn.add(entry); } catch (LDAPException ee) { + errors.add("LDAPUtil:importLDIF: exception in adding entry " + dn + + ":" + ee.toString() + "\n"); } } else if (type == LDIFContent.MODIFICATION_CONTENT) { LDIFModifyContent c = (LDIFModifyContent) content; @@ -60,6 +63,8 @@ public class LDAPUtil { try { conn.modify(dn, mods); } catch (LDAPException ee) { + errors.add("LDAPUtil:importLDIF: exception in modifying entry " + dn + + ":" + ee.toString()); } } } catch (Exception e) { |