Browse Source

Import 855391c1e37012b0d6c673a304bb8da8a1efcd72 from ctdb:
tdb: always set tdb->tracefd to -1 to be safe on goto fail

metze
(cherry picked from samba commit 85449b7bcc4bd7948bea38b5514a02357950a002)

Signed-off-by: Stefan Metzmacher <metze@samba.org>

Rusty Russell 16 years ago
parent
commit
110b06ab28
1 changed files with 3 additions and 4 deletions
  1. 3 4
      ccan/tdb/open.c

+ 3 - 4
ccan/tdb/open.c

@@ -164,6 +164,9 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 
 	tdb_io_init(tdb);
 	tdb->fd = -1;
+#ifdef TDB_TRACE
+	tdb->tracefd = -1;
+#endif
 	tdb->name = NULL;
 	tdb->map_ptr = NULL;
 	tdb->flags = tdb_flags;
@@ -208,10 +211,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 			TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: tdb_new_database failed!"));
 			goto fail;
 		}
-#ifdef TDB_TRACE
-		/* All tracing will fail.  That's ok. */
-		tdb->tracefd = -1;
-#endif
 		goto internal;
 	}