Attachment 312295 Details for Bug 455331 – patch take 3

patch take 3

java.patch (text/x-patch), 2.99 KB, created by Ade Lee on 2008-07-21 19:57:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ade Lee

Created: 2008-07-21 19:57:05 UTC

Size: 2.99 KB

patch

obsolete

>Index: pki/linux/common/pki-common.spec
>===================================================================
>--- pki/linux/common/pki-common.spec    (revision 71)
>+++ pki/linux/common/pki-common.spec    (working copy)
>@@ -33,7 +33,7 @@
> ## Package Header Definitions
> %define base_name         %{base_prefix}-%{base_component}
> %define base_version      1.0.0
>-%define base_release      12
>+%define base_release      13
> %define base_group        System Environment/Base
> %define base_vendor       Red Hat, Inc.
> %define base_license      GPLv2 with exceptions
>@@ -298,6 +298,8 @@
> ###############################################################################
> 
> %changelog
>+* Mon Jul 21 2008 Ade Lee <alee@redhat.com> 1.0.0-13
>+- Fix for Bug 455331.
> * Fri Jul 11 2008 Andrew Wnuk <awnuk@redhat.com> 1.0.0-12
> - Fix for bug #243804.
> * Wed Jul 9 2008 Christina Fu <cfu@redhat.com> 1.0.0-11
>
>Index: pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>===================================================================
>--- pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java     (revision 71)
>+++ pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java     (working copy)
>@@ -1262,15 +1262,15 @@
>     private String getInstanceDir(LDAPConnection conn) {
>         String instancedir="";
>         try {
>-            String filter = "(objectclass=nsslapdConfig)";
>-            String[] attrs = {"nsslapd-instancedir"};
>-            LDAPSearchResults results = conn.search("cn=config", LDAPv3.SCOPE_SUB,
>+            String filter = "(objectclass=*)";
>+            String[] attrs = {"nsslapd-directory"};
>+            LDAPSearchResults results = conn.search("cn=config,cn=ldbm database,cn=plugins,cn=config", LDAPv3.SCOPE_SUB,
>               filter, attrs, false);
> 
>             while (results.hasMoreElements()) {
>                 LDAPEntry entry = results.next();
>                 String dn = entry.getDN();
>-                CMS.debug("DatabasePanel getInstanceDir: DN for storing nsslapd-instancedir: "+dn);
>+                CMS.debug("DatabasePanel getInstanceDir: DN for storing nsslapd-directory: "+dn);
>                 LDAPAttributeSet entryAttrs = entry.getAttributeSet();
>                 Enumeration attrsInSet = entryAttrs.getAttributes();
>                 while (attrsInSet.hasMoreElements()) {
>@@ -1280,9 +1280,9 @@
>                     Enumeration valsInAttr = nextAttr.getStringValues();
>                     while ( valsInAttr.hasMoreElements() ) {
>                         String nextValue = (String)valsInAttr.nextElement();
>-                        if (attrName.equalsIgnoreCase("nsslapd-instancedir")) {
>+                        if (attrName.equalsIgnoreCase("nsslapd-directory")) {
>                             CMS.debug("DatabasePanel getInstanceDir: instanceDir="+nextValue);
>-                            return nextValue;
>+                            return nextValue.substring(0,nextValue.lastIndexOf("/db"));
>                         }
>                     }
>                 }
>

Actions: View

Attachments on bug 455331: 311776 | 311881 | 312295