Attachment 311881 Details for Bug 455331 – patch take 2

[patch] patch take 2

replication2.patch (text/plain), 3.35 KB, created by Ade Lee on 2008-07-15 20:12:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ade Lee

Created: 2008-07-15 20:12:11 UTC

Size: 3.35 KB

patch

obsolete

>Index: pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
>===================================================================
>--- pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java     (revision 66)
>+++ 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"));
>                         }
>                     }
>                 }
>
>Index: pki/linux/scripts/ds_remove_cgi_32
>===================================================================
>--- pki/linux/scripts/ds_remove_cgi_32  (revision 66)
>+++ pki/linux/scripts/ds_remove_cgi_32  (working copy)
>@@ -212,7 +212,15 @@
> 
> # stop the server
> my $instdir = "";
>-foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
>+my @paths;
>+if ( -d "/usr/lib/dirsrv/slapd-${instname}/stop-slapd" ) {
>+       $paths[0] = "/usr/lib/dirsrv/slapd-${instname}";
>+}
>+else  {
>+       @paths=@{$entry->{"nsslapd-instancedir"}};
>+}
>+
>+foreach my $path ( @paths )
> {
>     if ( -d $path )
>     {
>
>[root@goofy-vm1 src]# svn diff pki/linux/scripts/ds_remove_cgi_64
>Index: pki/linux/scripts/ds_remove_cgi_64
>===================================================================
>--- pki/linux/scripts/ds_remove_cgi_64  (revision 66)
>+++ pki/linux/scripts/ds_remove_cgi_64  (working copy)
>@@ -212,7 +212,15 @@
> 
> # stop the server
> my $instdir = "";
>-foreach my $path ( @{$entry->{"nsslapd-instancedir"}} )
>+my @paths;
>+if ( -d "/usr/lib/dirsrv/slapd-${instname}/stop-slapd" ) {
>+        $paths[0] = "/usr/lib64/dirsrv/slapd-${instname}";
>+}
>+else  {
>+        @paths=@{$entry->{"nsslapd-instancedir"}};
>+}
>+
>+foreach my $path ( @paths )
> {
>     if ( -d $path )
>     {
>

Actions: View | Diff

Attachments on bug 455331: 311776 | 311881 | 312295