- /*
+ /*
Unix SMB/CIFS implementation.
trivial database library
*/
if (tdb->map_ptr == MAP_FAILED) {
tdb->map_ptr = NULL;
- tdb_logerr(tdb, TDB_SUCCESS, TDB_DEBUG_WARNING,
+ tdb_logerr(tdb, TDB_SUCCESS, TDB_LOG_WARNING,
"tdb_mmap failed for size %lld (%s)",
(long long)tdb->map_size, strerror(errno));
}
/* check for an out of bounds access - if it is out of bounds then
see if the database has been expanded by someone else and expand
- if necessary
+ if necessary
note that "len" is the minimum length needed for the db
*/
static int tdb_oob(struct tdb_context *tdb, tdb_off_t len, bool probe)
return 0;
if (tdb->flags & TDB_INTERNAL) {
if (!probe) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_oob len %lld beyond internal"
" malloc size %lld",
(long long)len,
return -1;
if (fstat(tdb->fd, &st) != 0) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"Failed to fstat file: %s", strerror(errno));
tdb_unlock_expand(tdb, F_RDLCK);
return -1;
if (st.st_size < (size_t)len) {
if (!probe) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_oob len %zu beyond eof at %zu",
(size_t)len, st.st_size);
}
}
/* write a lump of data at a specified offset */
-static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
+static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
const void *buf, tdb_len_t len)
{
if (tdb->read_only) {
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
"Write to read-only database");
return -1;
}
if (ret >= 0)
errno = ENOSPC;
- tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_write: %zi at %zu len=%zu (%s)",
ret, (size_t)off, (size_t)len,
strerror(errno));
} else {
ssize_t r = pread(tdb->fd, buf, len, off);
if (r != len) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_read failed with %zi at %zu "
"len=%zu (%s) map_size=%zu",
r, (size_t)off, (size_t)len,
if (unlikely((tdb->flags & TDB_CONVERT))) {
void *conv = malloc(len);
if (!conv) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
"tdb_write: no memory converting"
" %zu bytes", len);
return -1;
int tdb_write_off(struct tdb_context *tdb, tdb_off_t off, tdb_off_t val)
{
if (tdb->read_only) {
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
"Write to read-only database");
return -1;
}
/* some systems don't like zero length malloc */
buf = malloc(prefix + len ? prefix + len : 1);
if (!buf) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_ERROR,
+ tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_USE_ERROR,
"tdb_alloc_read malloc failed len=%zu",
(size_t)(prefix + len));
} else if (unlikely(tdb->methods->tread(tdb, offset, buf+prefix, len)
if (ret >= 0)
errno = ENOSPC;
- tdb_logerr(tdb, TDB_ERR_IO, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"fill failed: %zi at %zu len=%zu (%s)",
ret, (size_t)off, (size_t)len,
strerror(errno));
char buf[8192];
if (tdb->read_only) {
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
"Expand on read-only database");
return -1;
}
if (tdb->flags & TDB_INTERNAL) {
char *new = realloc(tdb->map_ptr, tdb->map_size + addition);
if (!new) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_DEBUG_FATAL,
+ tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
"No memory to expand database");
return -1;
}
const void *tdb_access_read(struct tdb_context *tdb,
tdb_off_t off, tdb_len_t len, bool convert)
{
- const void *ret = NULL;
+ const void *ret = NULL;
if (likely(!(tdb->flags & TDB_CONVERT)))
ret = tdb->methods->direct(tdb, off, len, false);
void *ret = NULL;
if (tdb->read_only) {
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_DEBUG_WARNING,
+ tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
"Write to read-only database");
return NULL;
}