[389-ds-base] branch 389-ds-base-1.3.5 updated (ad0855f -> 1b4d2c6)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

firstyear pushed a change to branch 389-ds-base-1.3.5
in repository 389-ds-base.

from  ad0855f   Ticket 49273 - crash when DBVERSION is corrupt.
       new  1b4d2c6   Ticket 49273 - bak2db doesn't operate with dbversion

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Summary of changes:
 ldap/servers/slapd/back-ldbm/dbversion.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

[389-ds-base] 01/01: Ticket 49273 - bak2db doesn't operate with dbversion

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

firstyear pushed a commit to branch 389-ds-base-1.3.5
in repository 389-ds-base.

commit 1b4d2c63311a544bf845ae6e491ef27855f9f9c6
Author: William Brown 
Date:   Tue Jun 6 14:31:01 2017 +1000

Ticket 49273 - bak2db doesn't operate with dbversion

Bug Description:  in the dbversion corruption fix we checked for
    both ldbmversion and dataversion: however, we don't use dataversion
    in mostcases, and this causes an erro in db2bak during DBVERSION
    restore.

Fix Description:  Only check ldbmversion, not dataversion.
    dataversion is checked with a warning.

https://pagure.io/389-ds-base/issue/49273

Author: wibrown

Review by: mreynosd (Thanks!)
---
 ldap/servers/slapd/back-ldbm/dbversion.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ldap/servers/slapd/back-ldbm/dbversion.c b/ldap/servers/slapd/back-ldbm/dbversion.c
index eb60925..67e508c 100644
--- a/ldap/servers/slapd/back-ldbm/dbversion.c
+++ b/ldap/servers/slapd/back-ldbm/dbversion.c
@@ -176,7 +176,10 @@ dbversion_read(struct ldbminfo *li, const char *directory,
         }
         (void)PR_Close( prfd );

-        if (*ldbmversion == NULL || *dataversion == NULL) {
+        if (*dataversion == NULL ) {
+            slapi_log_err(SLAPI_LOG_DEBUG, "dbversion_read", "dataversion not present in "%s"\n", filename);
+        }
+        if (*ldbmversion == NULL ) {
             /* DBVERSIOn is corrupt, COMPLAIN! */
             /* This is IDRM           Identifier removed (POSIX.1)
              * which seems appropriate for the error here :)
@@ -185,7 +188,6 @@ dbversion_read(struct ldbminfo *li, const char *directory,
             slapi_log_err(SLAPI_LOG_CRIT, "dbversion_read", "It may be possible to recover by replacing with a valid DBVERSION file from another DB instance\n");
             return EIDRM;
         }
-
         return 0;
     }
 }