diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:26 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:26 +0930 |
commit | ef70f5dd35974115a85850d04b0f4b64e511659f (patch) | |
tree | 7904ff676e509cc4feec0887b8034f9c570eaaf1 /lib/tdb2/tdb1_open.c | |
parent | 6b11a2630123453a7f40f728641882c440b57010 (diff) | |
download | samba-ef70f5dd35974115a85850d04b0f4b64e511659f.tar.gz samba-ef70f5dd35974115a85850d04b0f4b64e511659f.tar.bz2 samba-ef70f5dd35974115a85850d04b0f4b64e511659f.zip |
tdb2: log allocation failures in tdb1 backend.
The TDB2 tests are stricter about this; they want every error logged.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 670ba98f74b52df541d153eeab9d3310932e75cd)
Diffstat (limited to 'lib/tdb2/tdb1_open.c')
-rw-r--r-- | lib/tdb2/tdb1_open.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/tdb2/tdb1_open.c b/lib/tdb2/tdb1_open.c index e22a6d1428..e668616a04 100644 --- a/lib/tdb2/tdb1_open.c +++ b/lib/tdb2/tdb1_open.c @@ -74,7 +74,7 @@ enum TDB_ERROR tdb1_new_database(struct tdb_context *tdb, struct tdb1_header *newdb; size_t size; int hash_size = TDB1_DEFAULT_HASH_SIZE; - enum TDB_ERROR ret = TDB_ERR_IO; + enum TDB_ERROR ret; tdb_context_init(tdb, max_dead); @@ -88,7 +88,8 @@ enum TDB_ERROR tdb1_new_database(struct tdb_context *tdb, /* We make it up in memory, then write it out if not internal */ size = sizeof(struct tdb1_header) + (hash_size+1)*sizeof(tdb1_off_t); if (!(newdb = (struct tdb1_header *)calloc(size, 1))) { - return TDB_ERR_OOM; + return tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR, + "Could not allocate new database header"); } /* Fill in the header */ @@ -113,15 +114,24 @@ enum TDB_ERROR tdb1_new_database(struct tdb_context *tdb, tdb->file->map_ptr = (char *)newdb; return TDB_SUCCESS; } - if (lseek(tdb->file->fd, 0, SEEK_SET) == -1) + if (lseek(tdb->file->fd, 0, SEEK_SET) == -1) { + ret = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb1_new_database: lseek failed"); goto fail; + } - if (ftruncate(tdb->file->fd, 0) == -1) + if (ftruncate(tdb->file->fd, 0) == -1) { + ret = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb1_new_database: ftruncate failed"); goto fail; + } - /* we still have "ret == TDB_ERR_IO" here */ - if (tdb1_write_all(tdb->file->fd, newdb, size)) - ret = TDB_SUCCESS; + if (!tdb1_write_all(tdb->file->fd, newdb, size)) { + ret = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb1_new_database: write failed"); + goto fail; + } + ret = TDB_SUCCESS; fail: SAFE_FREE(newdb); |