diff options
| author | Jeremy Allison <jra@samba.org> | 2008-04-11 17:24:31 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-04-11 17:24:31 -0700 |
| commit | 05c15785d75320749b673a98023b8386b20f23fe (patch) | |
| tree | 4e8decf7675b0adbfe845ee36c6ba9965195d01a /source3/lib | |
| parent | e76ec752be503338c0a26be34f8d0fb4fbeb5fe6 (diff) | |
| parent | 7d7b420ad13c1d6fc89569f1f0dc4df92d8e0c24 (diff) | |
| download | samba-05c15785d75320749b673a98023b8386b20f23fe.tar.gz samba-05c15785d75320749b673a98023b8386b20f23fe.tar.bz2 samba-05c15785d75320749b673a98023b8386b20f23fe.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 6a965e72a8650b275222548445d10b65aa61e765)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/netapi/netapi.c | 3 | ||||
| -rw-r--r-- | source3/lib/util_tdb.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c index 2478a8dda1..cb218f0ced 100644 --- a/source3/lib/netapi/netapi.c +++ b/source3/lib/netapi/netapi.c @@ -54,6 +54,9 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context) if (!DEBUGLEVEL) { DEBUGLEVEL = 0; } + + /* prevent setup_logging() from closing x_stderr... */ + dbf = 0; setup_logging("libnetapi", true); dbf = x_stderr; diff --git a/source3/lib/util_tdb.c b/source3/lib/util_tdb.c index ce5e77f8f4..8257232667 100644 --- a/source3/lib/util_tdb.c +++ b/source3/lib/util_tdb.c @@ -862,7 +862,7 @@ static void tdb_wrap_log(TDB_CONTEXT *tdb, enum tdb_debug_level level, switch (level) { case TDB_DEBUG_FATAL: - debug_level = 0; + debuglevel = 0; break; case TDB_DEBUG_ERROR: debuglevel = 1; |