diff options
| author | Simo Sorce <idra@samba.org> | 2008-06-14 13:00:53 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-06-14 13:00:53 -0400 |
| commit | 2daf2897d5c70c0efbeba9b827c62700b9a9537c (patch) | |
| tree | d0236f23f6774f775d2a150361c2f5a9674eaf06 /source4/smbd | |
| parent | 929adc9efa5cf985f0585214d30d18521aa1a821 (diff) | |
| download | samba-2daf2897d5c70c0efbeba9b827c62700b9a9537c.tar.gz samba-2daf2897d5c70c0efbeba9b827c62700b9a9537c.tar.bz2 samba-2daf2897d5c70c0efbeba9b827c62700b9a9537c.zip | |
Use a custom init function for samba4 that sets a samba4
specific debug function.
By default do not debug, this is the most appropriate action for a library
as we cannot assume what stderr is use for in the main app.
The main app is responsible to set ev_debug_stderr if they so desire.
(This used to be commit e566a2f308ac6fb4b526a744f7059b565670aea5)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_prefork.c | 4 | ||||
| -rw-r--r-- | source4/smbd/process_standard.c | 4 | ||||
| -rw-r--r-- | source4/smbd/process_thread.c | 4 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c index 839c7209d2..2ffb724a6c 100644 --- a/source4/smbd/process_prefork.c +++ b/source4/smbd/process_prefork.c @@ -115,7 +115,7 @@ static void prefork_new_task(struct event_context *ev, pid = getpid(); /* This is now the child code. We need a completely new event_context to work with */ - ev2 = event_context_init(NULL); + ev2 = s4_event_context_init(NULL); /* the service has given us a private pointer that encapsulates the context it needs for this new connection - @@ -173,7 +173,7 @@ static void prefork_new_task(struct event_context *ev, talloc_free(ev2); /* But we need a events system to handle reaping children */ - ev_parent = event_context_init(NULL); + ev_parent = s4_event_context_init(NULL); /* TODO: Handle some events... */ diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 820859400e..3f2936bb26 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -92,7 +92,7 @@ static void standard_accept_connection(struct event_context *ev, pid = getpid(); /* This is now the child code. We need a completely new event_context to work with */ - ev2 = event_context_init(NULL); + ev2 = s4_event_context_init(NULL); /* the service has given us a private pointer that encapsulates the context it needs for this new connection - @@ -161,7 +161,7 @@ static void standard_new_task(struct event_context *ev, pid = getpid(); /* This is now the child code. We need a completely new event_context to work with */ - ev2 = event_context_init(NULL); + ev2 = s4_event_context_init(NULL); /* the service has given us a private pointer that encapsulates the context it needs for this new connection - diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index 5a45cdfeac..540d956420 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -77,7 +77,7 @@ static void thread_accept_connection(struct event_context *ev, struct new_conn_state *state; struct event_context *ev2; - ev2 = event_context_init(ev); + ev2 = s4_event_context_init(ev); if (ev2 == NULL) return; state = talloc(ev2, struct new_conn_state); @@ -160,7 +160,7 @@ static void thread_new_task(struct event_context *ev, struct new_task_state *state; struct event_context *ev2; - ev2 = event_context_init(ev); + ev2 = s4_event_context_init(ev); if (ev2 == NULL) return; state = talloc(ev2, struct new_task_state); diff --git a/source4/smbd/server.c b/source4/smbd/server.c index c1c8b6368f..74c87c68a4 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -313,7 +313,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ /* the event context is the top level structure in smbd. Everything else should hang off that */ - event_ctx = event_context_init(talloc_autofree_context()); + event_ctx = s4_event_context_init(talloc_autofree_context()); if (event_ctx == NULL) { DEBUG(0,("Initializing event context failed\n")); |