From: Kamen Mazdrashki Date: Thu, 4 Nov 2010 01:27:10 +0000 (+0200) Subject: s4-ldb_module.h: use LDB error code for ldb_error() macro rather than LDB_DEBUG_FATAL X-Git-Tag: samba-4.0.0alpha14~1341 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=78b05a3116b26e57f43f2d27038d8688f245d33e;p=nivanova%2Fsamba-autobuild%2F.git s4-ldb_module.h: use LDB error code for ldb_error() macro rather than LDB_DEBUG_FATAL We end up calling ldb_error_at() which expects an LDB error, but LDB_DEBUG_FATAL is not such code. It is actually equal to LDB_SUCCESS. Thus the effect is that we report a *fatal* error, but return LDB_SUCCESS in many places. Autobuild-User: Kamen Mazdrashki Autobuild-Date: Thu Nov 4 12:57:33 UTC 2010 on sn-devel-104 --- diff --git a/source4/lib/ldb/include/ldb_module.h b/source4/lib/ldb/include/ldb_module.h index e88c887f200..50c606b082c 100644 --- a/source4/lib/ldb/include/ldb_module.h +++ b/source4/lib/ldb/include/ldb_module.h @@ -78,7 +78,7 @@ void ldb_debug_end(struct ldb_context *ldb, enum ldb_debug_level level); #define ldb_error(ldb, ecode, reason) ldb_error_at(ldb, ecode, reason, __FILE__, __LINE__) -#define ldb_oom(ldb) ldb_error(ldb, LDB_DEBUG_FATAL, "ldb out of memory") +#define ldb_oom(ldb) ldb_error(ldb, LDB_ERR_OPERATIONS_ERROR, "ldb out of memory") #define ldb_module_oom(module) ldb_oom(ldb_module_get_ctx(module)) #define ldb_operr(ldb) ldb_error(ldb, LDB_ERR_OPERATIONS_ERROR, "operations error")