summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-02-18 09:11:52 +0100
committerMichael Adam <obnox@samba.org>2013-02-19 23:47:48 +0100
commit22dd9e7c792c4decf4fcbe3b1ed2ea1f165c2af6 (patch)
tree405adeb582a2f912b386249d4ac05e87d8bb3f7e
parente8bda0017c5f8770dc3dce238ea3cefb1f4dd73f (diff)
downloadsamba-22dd9e7c792c4decf4fcbe3b1ed2ea1f165c2af6.tar.gz
samba-22dd9e7c792c4decf4fcbe3b1ed2ea1f165c2af6.tar.bz2
samba-22dd9e7c792c4decf4fcbe3b1ed2ea1f165c2af6.zip
s3:utils: make use of samba_tevent_context_init()
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/utils/dbwrap_tool.c2
-rw-r--r--source3/utils/dbwrap_torture.c2
-rw-r--r--source3/utils/net.c2
-rw-r--r--source3/utils/net_g_lock.c2
-rw-r--r--source3/utils/smbcontrol.c2
-rw-r--r--source3/utils/status.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index 7c90b54de7..aab5773dcc 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -522,7 +522,7 @@ int main(int argc, const char **argv)
goto done;
}
- evt_ctx = tevent_context_init(mem_ctx);
+ evt_ctx = samba_tevent_context_init(mem_ctx);
if (evt_ctx == NULL) {
d_fprintf(stderr, "ERROR: could not init event context\n");
goto done;
diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index fb4ed6d4ec..9ece297288 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -286,7 +286,7 @@ int main(int argc, const char *argv[])
lp_load_global(get_dyn_CONFIGFILE());
- ev_ctx = tevent_context_init(mem_ctx);
+ ev_ctx = samba_tevent_context_init(mem_ctx);
if (ev_ctx == NULL) {
d_fprintf(stderr, "ERROR: could not init event context\n");
goto done;
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 465d2a0821..3473641630 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -950,7 +950,7 @@ static struct functable net_func[] = {
/* Failing to init the msg_ctx isn't a fatal error. Only
root-level things (joining/leaving domains etc.) will be denied. */
- c->msg_ctx = messaging_init(c, event_context_init(c));
+ c->msg_ctx = messaging_init(c, samba_tevent_context_init(c));
rc = net_run_function(c, argc_new-1, argv_new+1, "net", net_func);
diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c
index 05a7392eb9..8de5c7cc33 100644
--- a/source3/utils/net_g_lock.c
+++ b/source3/utils/net_g_lock.c
@@ -31,7 +31,7 @@ static bool net_g_lock_init(TALLOC_CTX *mem_ctx,
struct messaging_context *msg = NULL;
struct g_lock_ctx *g_ctx = NULL;
- ev = tevent_context_init(mem_ctx);
+ ev = samba_tevent_context_init(mem_ctx);
if (ev == NULL) {
d_fprintf(stderr, "ERROR: could not init event context\n");
goto fail;
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 0e4a8cc7b7..47884ff861 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1500,7 +1500,7 @@ int main(int argc, const char **argv)
* routines mostly return True==1 for success, but
* shell needs 0. */
- if (!(evt_ctx = tevent_context_init(NULL)) ||
+ if (!(evt_ctx = samba_tevent_context_init(NULL)) ||
!(msg_ctx = messaging_init(NULL, evt_ctx))) {
fprintf(stderr, "could not init messaging context\n");
TALLOC_FREE(frame);
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 0cb46a5f53..28a79d6018 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -422,7 +422,7 @@ static void print_notify_recs(const char *path,
* connection, usable by the db_open() calls further
* down.
*/
- msg_ctx = messaging_init(NULL, event_context_init(NULL));
+ msg_ctx = messaging_init(NULL, samba_tevent_context_init(NULL));
if (msg_ctx == NULL) {
fprintf(stderr, "messaging_init failed\n");
ret = -1;