sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

ldb: Always log when the database pack format changes

Browse Source 
LDB_DEBUG_WARNING gets logged by Samba as level 2, whereas the default
log level for Samba is 0. It's not really fair to the user to change the
format of their database on disk and potentially not tell them.

This patch adds a log with level zero (using a alias define, as this
technically isn't a fatal problem).

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14059

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Tim Beale 2019-07-30 16:40:55 +12:00 committed by Garming Sam
parent 6dcf00ba0a
commit a2b0fc7c00
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ldb/include/ldb.h
View File

@ -220,6 +220,9 @@ struct tevent_context;
enum ldb_debug_level {LDB_DEBUG_FATAL, LDB_DEBUG_ERROR,
LDB_DEBUG_WARNING, LDB_DEBUG_TRACE};
/* alias for something that's not a fatal error but we really want to log */
#define LDB_DEBUG_ALWAYS_LOG LDB_DEBUG_FATAL
/**
the user can optionally supply a debug function. The function
is based on the vfprintf() style of interface, but with the addition

2
lib/ldb/ldb_key_value/ldb_kv_index.c
View File

@ -3571,7 +3571,7 @@ static int re_pack(struct ldb_kv_private *ldb_kv,
* want to spam the log.
*/
if ((!ctx->normal_record_seen) && (!ldb_dn_is_special(msg->dn))) {
ldb_debug(ldb, LDB_DEBUG_WARNING,
ldb_debug(ldb, LDB_DEBUG_ALWAYS_LOG,
"Repacking database with format %#010x",
ldb_kv->pack_format_version);
ctx->normal_record_seen = true;