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)

5 files changed, 7 insertions, 7 deletions

diff --git a/source4/lib/registry/registry_wrap.c b/source4/lib/registry/registry_wrap.c
index e939e4101d..3fc34b1fe3 100644
--- a/source4/lib/registry/registry_wrap.c
+++ b/source4/lib/registry/registry_wrap.c
@@ -3486,7 +3486,7 @@ SWIGINTERN PyObject *_wrap_hive_key(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   
   arg3 = NULL;
   arg4 = NULL;
-  arg5 = event_context_init(NULL);
+  arg5 = s4_event_context_init(NULL);
   arg6 = loadparm_init(NULL);
   arg1 = NULL;
   arg7 = &tmp7;
@@ -3574,7 +3574,7 @@ SWIGINTERN PyObject *_wrap_open_ldb(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
   
   arg3 = NULL;
   arg4 = NULL;
-  arg5 = event_context_init(NULL);
+  arg5 = s4_event_context_init(NULL);
   arg6 = loadparm_init(NULL);
   arg1 = NULL;
   arg7 = &tmp7;
@@ -3735,7 +3735,7 @@ SWIGINTERN PyObject *_wrap_open_samba(PyObject *SWIGUNUSEDPARM(self), PyObject *
     (char *) "ev_ctx",(char *) "lp_ctx",(char *) "session_info",(char *) "credentials", NULL 
   };
   
-  arg3 = event_context_init(NULL);
+  arg3 = s4_event_context_init(NULL);
   arg4 = loadparm_init(NULL);
   arg5 = NULL;
   arg6 = NULL;
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 9b49799bed..240c582340 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -118,7 +118,7 @@ int main(int argc, const char **argv)
 
 	}
 
-	ev_ctx = event_context_init(NULL);
+	ev_ctx = s4_event_context_init(NULL);
 
 	h1 = open_backend(pc, ev_ctx, cmdline_lp_ctx, backend1, remote1);
 	if (h1 == NULL)
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 9285459d85..1170fbadb4 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 	while((opt = poptGetNextOpt(pc)) != -1) {
 	}
 
-	ev = event_context_init(NULL);
+	ev = s4_event_context_init(NULL);
 
 	if (remote) {
 		h = reg_common_open_remote (remote, cmdline_lp_ctx, cmdline_credentials);
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 80eafcc4a2..4e859df3f6 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -517,7 +517,7 @@ int main(int argc, char **argv)
 
 	ctx = talloc_zero(NULL, struct regshell_context);
 
-	ev_ctx = event_context_init(ctx);
+	ev_ctx = s4_event_context_init(ctx);
 
 	if (remote != NULL) {
 		ctx->registry = reg_common_open_remote(remote, cmdline_lp_ctx, 
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 440399f764..daca6957a1 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
 	while((opt = poptGetNextOpt(pc)) != -1) {
 	}
 
-	ev_ctx = event_context_init(NULL);
+	ev_ctx = s4_event_context_init(NULL);
 
 	if (remote != NULL) {
 		h = reg_common_open_remote(remote, cmdline_lp_ctx, cmdline_credentials);