Changeset 989 for vendor/current/source3/lib/dbwrap

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/source3/lib/dbwrap/dbwrap_ctdb.c (modified) (5 diffs)

vendor/current/source3/lib/dbwrap/dbwrap_ctdb.c

@@ -1217 +1217 @@
         bool ask_for_readonly_copy;
         bool done;
+        bool empty_record;
 };
 
@@ -1236 +1237 @@
 
         if (db_ctdb_can_use_local_hdr(header, true)) {
-                state->parser(key, data, state->private_data);
+                /*
+                 * A record consisting only of the ctdb header can be
+                 * a validly created empty record or a tombstone
+                 * record of a deleted record (not vacuumed yet). Mark
+                 * it accordingly.
+                 */
+                state->empty_record = (data.dsize == 0);
+                if (!state->empty_record) {
+                        state->parser(key, data, state->private_data);
+                }
                 state->done = true;
         } else {
@@ -1262 +1272 @@
         state.parser = parser;
         state.private_data = private_data;
+        state.empty_record = false;
 
         if (ctx->transaction != NULL) {
@@ -1293 +1304 @@
                 ctx, key, db_ctdb_parse_record_parser_nonpersistent, &state);
         if (NT_STATUS_IS_OK(status) && state.done) {
+                if (state.empty_record) {
+                        /*
+                         * We know authoritatively, that this is an empty
+                         * record. Since ctdb does not distinguish between empty
+                         * and deleted records, this can be a record stored as
+                         * empty or a not-yet-vacuumed tombstone record of a
+                         * deleted record. Now Samba right now can live without
+                         * empty records, so we can safely report this record
+                         * as non-existing.
+                         *
+                         * See bugs 10008 and 12005.
+                         */
+                        return NT_STATUS_NOT_FOUND;
+                }
                 return NT_STATUS_OK;
         }
@@ -1299 +1324 @@
                           state.ask_for_readonly_copy, parser, private_data);
         if (ret != 0) {
+                if (ret == ENOENT) {
+                        /*
+                         * This maps to
+                         * NT_STATUS_OBJECT_NAME_NOT_FOUND. Our upper
+                         * layers expect NT_STATUS_NOT_FOUND for "no
+                         * record around". We need to convert dbwrap
+                         * to 0/errno away from NTSTATUS ... :-)
+                         */
+                        return NT_STATUS_NOT_FOUND;
+                }
                 return map_nt_error_from_unix(ret);
         }