sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

s4:cmdline: setup talloc log and abort functions

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-07-30 08:37:01 +02:00 committed by Andrew Tridgell
parent 5cefde4075
commit 251b03eee6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/include/includes.h
View File

@ -68,11 +68,6 @@
#include "../lib/util/smb_threads.h" #include "../lib/util/smb_threads.h"
#include "../lib/util/smb_threads_internal.h" #include "../lib/util/smb_threads_internal.h"
#if 0
/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
#define TALLOC_ABORT(reason) smb_panic(reason)
#endif
#if defined(UID_WRAPPER) #if defined(UID_WRAPPER)
#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE) #if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
#define UID_WRAPPER_REPLACE #define UID_WRAPPER_REPLACE

7
source4/lib/cmdline/popt_common.c
View File

@ -53,6 +53,11 @@ static void popt_version_callback(poptContext con,
} }
} }
static void popt_s4_talloc_log_fn(const char *message)
{
DEBUG(0,("%s", message));
}
static void popt_samba_callback(poptContext con, static void popt_samba_callback(poptContext con,
enum poptCallbackReason reason, enum poptCallbackReason reason,
const struct poptOption *opt, const struct poptOption *opt,
@ -86,6 +91,8 @@ static void popt_samba_callback(poptContext con,
/* and logging */ /* and logging */
setup_logging(pname, DEBUG_STDOUT); setup_logging(pname, DEBUG_STDOUT);
talloc_set_log_fn(popt_s4_talloc_log_fn);
talloc_set_abort_fn(smb_panic);
return; return;
} }