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

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

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

commit 6725e03187610ef852e1577f1a2745320f30b088
Author: William Brown <firstyear@redhat.com>
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 33ca329..58b6732 100644
--- a/ldap/servers/slapd/back-ldbm/dbversion.c
+++ b/ldap/servers/slapd/back-ldbm/dbversion.c
@@ -177,7 +177,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 :)
@@ -186,7 +189,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;
}
}

--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org