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

r18832: fixed standalone build

Browse Source
This commit is contained in:
Andrew Tridgell 2006-09-22 23:25:16 +00:00 committed by Gerald (Jerry) Carter
parent 6ace943fac
commit 1ebc098b67
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
View File

@ -58,7 +58,22 @@ static int ltdb_wrap_destructor(struct ltdb_wrap *w)
return 0;
}
#if (_SAMBA_BUILD_ >= 4)
#if defined(_SAMBA_BUILD_) && (_SAMBA_BUILD_ <= 3)
static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...)
{
/* until we merge the tdb debug changes into samba3, we don't know
how serious the error is, and we can't go via the ldb loggin code */
va_list ap;
const char *name = tdb_name(tdb);
char *message;
va_start(ap, fmt);
message = talloc_vasprintf(NULL, fmt, ap);
va_end(ap);
DEBUG(3, ("ltdb: tdb(%s): %s", name, message));
talloc_free(message);
}
#else
static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...)
{
@ -91,21 +106,6 @@ static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, con
ldb_debug(ldb, ldb_level, "ltdb: tdb(%s): %s", name, message);
talloc_free(message);
}
#else
static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
static void ltdb_log_fn(struct tdb_context *tdb, int level, const char *fmt, ...)
{
/* until we merge the tdb debug changes into samba3, we don't know
how serious the error is, and we can't go via the ldb loggin code */
va_list ap;
const char *name = tdb_name(tdb);
char *message;
va_start(ap, fmt);
message = talloc_vasprintf(NULL, fmt, ap);
va_end(ap);
DEBUG(3, ("ltdb: tdb(%s): %s", name, message));
talloc_free(message);
}
#endif
/*
@ -122,13 +122,13 @@ struct tdb_context *ltdb_wrap_open(TALLOC_CTX *mem_ctx,
{
struct ltdb_wrap *w;
struct stat st;
#if (_SAMBA_BUILD_ >= 4)
#if (_SAMBA_BUILD_ <= 3)
tdb_log_func log_ctx_p = ltdb_log_fn;
#else
struct tdb_logging_context log_ctx;
struct tdb_logging_context log_ctx_p = &log_ctx;
log_ctx.log_fn = ltdb_log_fn;
log_ctx.log_private = ldb;
#else
tdb_log_func log_ctx_p = ltdb_log_fn;
#endif
if (stat(path, &st) == 0) {