sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-06 08:23:50 +03:00
Code Activity

r23339: merge from SAMBA_3_0:

Browse Source 
fix a crash bug...I wonder why only HP-UX 11.00 ans 11.11 noticed
it via a SIGBUS...

I missed to remove the samba3 specifc code path to tdb_open_ex()
when I synced lib/tdb/ with samba4. The explicit cast in on tdb_open_ex()
dropped the compiler warning :-(

metze
This commit is contained in:
Stefan Metzmacher
2007-06-04 14:26:37 +00:00
committed by Gerald (Jerry) Carter
parent 96df61e3a8
commit df6e3bec36
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,22 +57,6 @@ static int ltdb_wrap_destructor(struct ltdb_wrap *w)
return 0; return 0;
} }
#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, ...) PRINTF_ATTRIBUTE(3, 4);
static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...)
{ {
@@ -105,7 +89,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); ldb_debug(ldb, ldb_level, "ltdb: tdb(%s): %s", name, message);
talloc_free(message); talloc_free(message);
} }
#endif
/* /*
wrapped connection to a tdb database. The caller should _not_ free wrapped connection to a tdb database. The caller should _not_ free
@@ -121,14 +104,10 @@ struct tdb_context *ltdb_wrap_open(TALLOC_CTX *mem_ctx,
{ {
struct ltdb_wrap *w; struct ltdb_wrap *w;
struct stat st; struct stat st;
#if defined(_SAMBA_BUILD_) && (_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;
const struct tdb_logging_context *log_ctx_p = &log_ctx;
log_ctx.log_fn = ltdb_log_fn; log_ctx.log_fn = ltdb_log_fn;
log_ctx.log_private = ldb; log_ctx.log_private = ldb;
#endif
if (stat(path, &st) == 0) { if (stat(path, &st) == 0) {
for (w=tdb_list;w;w=w->next) { for (w=tdb_list;w;w=w->next) {
@@ -146,7 +125,7 @@ struct tdb_context *ltdb_wrap_open(TALLOC_CTX *mem_ctx,
return NULL; return NULL;
} }
w->tdb = tdb_open_ex(path, hash_size, tdb_flags, open_flags, mode, log_ctx_p, NULL); w->tdb = tdb_open_ex(path, hash_size, tdb_flags, open_flags, mode, &log_ctx, NULL);
if (w->tdb == NULL) { if (w->tdb == NULL) {
talloc_free(w); talloc_free(w);
return NULL; return NULL;