Fix policy DB fallback error handling

In osa_adb_open_and_lock(), if the btree dbopen() call returns EINVAL
or EFTYPE and the fallback hash dbopen() call also returns an error,
release the lock and return an error instead of returning success with
a null database.

ticket: 9082 (new)

diff --git a/src/plugins/kdb/db2/adb_openclose.c b/src/plugins/kdb/db2/adb_openclose.c
index 7db30a33b0cba79b758a3ce3994e50971d68ee3a..9a506e9d44a01e897746aedd9ddc9cec93600a2e 100644 (file)
--- a/src/plugins/kdb/db2/adb_openclose.c
+++ b/src/plugins/kdb/db2/adb_openclose.c
@@ -327,18 +327,13 @@ osa_adb_open_and_lock(osa_adb_princ_t db, int locktype)
         goto open_ok;
 
     db->db = dbopen(db->filename, O_RDWR, 0600, DB_BTREE, &db->btinfo);
-    if (db->db != NULL)
-        goto open_ok;
-    if (IS_EFTYPE(errno)) {
+    if (db->db == NULL && IS_EFTYPE(errno))
         db->db = dbopen(db->filename, O_RDWR, 0600, DB_HASH, &db->info);
-        if (db->db != NULL)
-            goto open_ok;
-    } else {
-        (void) osa_adb_release_lock(db);
-        if (errno == EINVAL)
-            return OSA_ADB_BAD_DB;
-        return errno;
+    if (db->db == NULL) {
+        (void)osa_adb_release_lock(db);
+        return (errno == EINVAL) ? OSA_ADB_BAD_DB : errno;
     }
+
 open_ok:
     db->opencnt++;
     return OSA_ADB_OK;