1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00

Move talloc_enable_null_tracking() to the s3 daemons

This commit is contained in:
Volker Lendecke 2010-09-24 18:45:52 +02:00
parent 584ac76a4f
commit b5ed09c3af
4 changed files with 21 additions and 10 deletions

View File

@ -1013,13 +1013,6 @@ _PUBLIC_ void *talloc_init(const char *fmt, ...)
void *ptr;
const char *name;
/*
* samba3 expects talloc_report_depth_cb(NULL, ...)
* reports all talloc'ed memory, so we need to enable
* null_tracking
*/
talloc_enable_null_tracking();
ptr = __talloc(NULL, 0);
if (unlikely(ptr == NULL)) return NULL;

View File

@ -780,9 +780,15 @@ static bool open_sockets(bool isdaemon, int port)
POPT_COMMON_SAMBA
{ NULL }
};
TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
TALLOC_CTX *frame;
NTSTATUS status;
/*
* Do this before any other talloc operation
*/
talloc_enable_null_tracking();
frame = talloc_stackframe();
load_case_tables();
global_nmb_port = NMB_PORT;

View File

@ -857,11 +857,17 @@ extern void build_options(bool screen);
POPT_TABLEEND
};
struct smbd_parent_context *parent = NULL;
TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
TALLOC_CTX *frame;
NTSTATUS status;
uint64_t unique_id;
struct rpc_srv_callbacks spoolss_cb;
/*
* Do this before any other talloc operation
*/
talloc_enable_null_tracking();
frame = talloc_stackframe();
/* Initialize the event context, it will panic on error */
smbd_event_context();

View File

@ -1124,9 +1124,15 @@ int main(int argc, char **argv, char **envp)
};
poptContext pc;
int opt;
TALLOC_CTX *frame = talloc_stackframe();
TALLOC_CTX *frame;
NTSTATUS status;
/*
* Do this before any other talloc operation
*/
talloc_enable_null_tracking();
frame = talloc_stackframe();
/* glibc (?) likes to print "User defined signal 1" and exit if a
SIGUSR[12] is received before a handler is installed */