Attachment 630257 Details for Bug 867640 – Reverts Bugzilla Bug #819111 - non-existent container ou=csusers breaks replication

[patch] Reverts Bugzilla Bug #819111 - non-existent container ou=csusers breaks replication

0001-Reverts-819111-non-existent-container-ou-csusers-bre.patch (text/plain), 5.53 KB, created by Matthew Harmsen on 2012-10-19 21:39:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Harmsen

Created: 2012-10-19 21:39:06 UTC

Size: 5.53 KB

patch

obsolete

>From 39cfc7943a268874a9d9d3e830c7185c3cf6a965 Mon Sep 17 00:00:00 2001
>From: Matthew Harmsen <mharmsen@redhat.com>
>Date: Fri, 19 Oct 2012 14:27:10 -0700
>Subject: [PATCH] Reverts #819111 - non-existent container ou=csusers breaks replication
>
>---
> .../cms/servlet/csadmin/DatabasePanel.java         |   22 +------------
> patches/pki-core-9.0.3-bz819111.patch              |   33 --------------------
> specs/pki-core.spec                                |    9 +++--
> 3 files changed, 7 insertions(+), 57 deletions(-)
> delete mode 100644 patches/pki-core-9.0.3-bz819111.patch
>
>diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>index 8a26ce4..bdd0b0d 100644
>--- a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>@@ -1210,27 +1210,7 @@ public class DatabasePanel extends WizardPanelBase {
>       throws LDAPException {
>         LDAPAttributeSet attrs = null;
>         LDAPEntry entry = null;
>-
>-        // for older subsystems, the container ou=csusers, cn=config may not yet exist
>-        String dn = "ou=csusers, cn=config";
>-        try {
>-            attrs = new LDAPAttributeSet();
>-            attrs.add(new LDAPAttribute("objectclass", "top"));
>-            attrs.add(new LDAPAttribute("objectclass", "organizationalUnit"));
>-            attrs.add(new LDAPAttribute("ou", "csusers"));
>-            entry = new LDAPEntry(dn, attrs);
>-            conn.add(entry);
>-        } catch (LDAPException e) {
>-            if (e.getLDAPResultCode() == LDAPException.ENTRY_ALREADY_EXISTS) {
>-                CMS.debug("createReplicationManager: containing ou already exists");
>-            } else {
>-                CMS.debug("createReplicationManager: Failed to create containing ou. Exception: "
>-                        + e.toString());
>-                throw e;
>-            }
>-        }
>-
>-        dn = "cn=" + bindUser + ",ou=csusers,cn=config";
>+        String dn = "cn=" + bindUser + ",cn=config";
>         try {
>             attrs = new LDAPAttributeSet();
>             attrs.add(new LDAPAttribute("objectclass", "top"));
>diff --git a/patches/pki-core-9.0.3-bz819111.patch b/patches/pki-core-9.0.3-bz819111.patch
>deleted file mode 100644
>index 831fa9f..0000000
>--- a/patches/pki-core-9.0.3-bz819111.patch
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>-index bdd0b0d..8a26ce4 100644
>---- a/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>-+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>-@@ -1210,7 +1210,27 @@ public class DatabasePanel extends WizardPanelBase {
>-       throws LDAPException {
>-         LDAPAttributeSet attrs = null;
>-         LDAPEntry entry = null;
>--        String dn = "cn=" + bindUser + ",cn=config";
>-+
>-+        // for older subsystems, the container ou=csusers, cn=config may not yet exist
>-+        String dn = "ou=csusers, cn=config";
>-+        try {
>-+            attrs = new LDAPAttributeSet();
>-+            attrs.add(new LDAPAttribute("objectclass", "top"));
>-+            attrs.add(new LDAPAttribute("objectclass", "organizationalUnit"));
>-+            attrs.add(new LDAPAttribute("ou", "csusers"));
>-+            entry = new LDAPEntry(dn, attrs);
>-+            conn.add(entry);
>-+        } catch (LDAPException e) {
>-+            if (e.getLDAPResultCode() == LDAPException.ENTRY_ALREADY_EXISTS) {
>-+                CMS.debug("createReplicationManager: containing ou already exists");
>-+            } else {
>-+                CMS.debug("createReplicationManager: Failed to create containing ou. Exception: "
>-+                        + e.toString());
>-+                throw e;
>-+            }
>-+        }
>-+
>-+        dn = "cn=" + bindUser + ",ou=csusers,cn=config";
>-         try {
>-             attrs = new LDAPAttributeSet();
>-             attrs.add(new LDAPAttribute("objectclass", "top"));
>diff --git a/specs/pki-core.spec b/specs/pki-core.spec
>index cbd0064..e4fee02 100644
>--- a/specs/pki-core.spec
>+++ b/specs/pki-core.spec
>@@ -1,6 +1,6 @@
> Name:             pki-core
> Version:          9.0.3
>-Release:          26%{?dist}
>+Release:          27%{?dist}
> Summary:          Certificate System - PKI Core Components
> URL:              http://pki.fedoraproject.org/
> License:          GPLv2
>@@ -60,7 +60,7 @@ Patch25:          %{name}-%{version}-bz771790.patch
> Patch26:          %{name}-%{version}-bz745677.patch
> Patch27:          %{name}-%{version}-bz769388.patch
> Patch28:          %{name}-%{version}-bz802396.patch
>-Patch29:          %{name}-%{version}-bz819111.patch
>+#Patch29:          %{name}-%{version}-bz819111.patch
> Patch30:          %{name}-%{version}-bz844459.patch
> Patch31:          %{name}-%{version}-bz841663.patch
> Patch32:          %{name}-%{version}-bz858864.patch
>@@ -437,7 +437,7 @@ This package is a part of the PKI Core used by the Certificate System.
> %patch26 -p2 -b .p26
> %patch27 -p2 -b .p27
> %patch28 -p2 -b .p28
>-%patch29 -p1 -b .p29
>+#%patch29 -p1 -b .p29
> %patch30 -p1 -b .p30
> %patch31 -p1 -b .p31
> %patch32 -p1 -b .p32
>@@ -675,6 +675,9 @@ fi
> 
> 
> %changelog
>+* Fri Oct 19 2012 Ade Lee <alee@redhat.com> 9.0.3-27
>+- REVERT Resolves #819111 - Non-existent container breaks replication
>+
> * Fri Sep 28 2012 Ade Lee <alee@redhat.com> 9.0.3-26
> - Resolves #844459 - Increase audit cert renewal range to 2 years (mharmsen)
> - Resolves #841663 - serial number incorrectly cast from BigInt to integer in
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 867640: 630257