summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorChristof Schmitt <cs@samba.org>2018-08-21 11:09:16 -0700
committerAndreas Schneider <asn@cryptomilk.org>2018-09-07 17:26:17 +0200
commitcc76aaeb6234698bca5d6520bb14a9306c9131cd (patch)
tree114c34bce81744946c480bc78b8321cd51fd8612 /source3/torture
parentae7db3e543d412864fafb0d0303c2219ce344526 (diff)
downloadsamba-cc76aaeb6234698bca5d6520bb14a9306c9131cd.tar.gz
s3: Rename server_messaging_context() to global_messaging_context()
This reflects that the messaging context is also used outside of the server processes. The command used for the rename: find . -name '*.[hc]' -print0 | xargs -0 sed -i 's/server_messaging_context/global_messaging_context/' Signed-off-by: Christof Schmitt <cs@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/test_dbwrap_ctdb.c2
-rw-r--r--source3/torture/test_dbwrap_do_locked.c4
-rw-r--r--source3/torture/test_g_lock.c2
-rw-r--r--source3/torture/vfstest.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/source3/torture/test_dbwrap_ctdb.c b/source3/torture/test_dbwrap_ctdb.c
index 1da5c94a556..eddcdf11290 100644
--- a/source3/torture/test_dbwrap_ctdb.c
+++ b/source3/torture/test_dbwrap_ctdb.c
@@ -34,7 +34,7 @@ bool run_local_dbwrap_ctdb(int dummy)
uint32_t val;
struct messaging_context *msg_ctx;
- msg_ctx = server_messaging_context();
+ msg_ctx = global_messaging_context();
db = db_open_ctdb(talloc_tos(), msg_ctx, "torture.tdb",
0, TDB_DEFAULT,
diff --git a/source3/torture/test_dbwrap_do_locked.c b/source3/torture/test_dbwrap_do_locked.c
index 9245e5d357d..a5b9d4400cf 100644
--- a/source3/torture/test_dbwrap_do_locked.c
+++ b/source3/torture/test_dbwrap_do_locked.c
@@ -83,9 +83,9 @@ bool run_dbwrap_do_locked1(int dummy)
fprintf(stderr, "global_event_context() failed\n");
return false;
}
- msg = server_messaging_context();
+ msg = global_messaging_context();
if (msg == NULL) {
- fprintf(stderr, "server_messaging_context() failed\n");
+ fprintf(stderr, "global_messaging_context() failed\n");
return false;
}
diff --git a/source3/torture/test_g_lock.c b/source3/torture/test_g_lock.c
index 29046d67886..352121e4194 100644
--- a/source3/torture/test_g_lock.c
+++ b/source3/torture/test_g_lock.c
@@ -36,7 +36,7 @@ static bool get_g_lock_ctx(TALLOC_CTX *mem_ctx,
fprintf(stderr, "tevent_context_init failed\n");
return false;
}
- *msg = server_messaging_context();
+ *msg = global_messaging_context();
if (*msg == NULL) {
fprintf(stderr, "messaging_init failed\n");
TALLOC_FREE(*ev);
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index e17e6fc5c34..0f80d11daae 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -536,7 +536,7 @@ int main(int argc, const char *argv[])
return 1;
}
- status = create_conn_struct_tos(server_messaging_context(),
+ status = create_conn_struct_tos(global_messaging_context(),
-1,
getcwd(cwd, sizeof(cwd)),
session_info,