From 752bffc53fcf296f841d62ffbf8d424f9e8e66bd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 23 Feb 2010 15:04:10 +0100 Subject: s3: Consolidate server_id_self into the equivalent procid_self() --- source3/utils/dbwrap_tool.c | 2 +- source3/utils/dbwrap_torture.c | 2 +- source3/utils/net_g_lock.c | 2 +- source3/utils/smbcontrol.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c index 38b3903265..6fbef5f131 100644 --- a/source3/utils/dbwrap_tool.c +++ b/source3/utils/dbwrap_tool.c @@ -298,7 +298,7 @@ int main(int argc, const char **argv) goto done; } - msg_ctx = messaging_init(mem_ctx, server_id_self(), evt_ctx); + msg_ctx = messaging_init(mem_ctx, procid_self(), evt_ctx); if (msg_ctx == NULL) { d_fprintf(stderr, "ERROR: could not init messaging context\n"); goto done; diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c index f96b8f176c..04e17946c2 100644 --- a/source3/utils/dbwrap_torture.c +++ b/source3/utils/dbwrap_torture.c @@ -287,7 +287,7 @@ int main(int argc, const char *argv[]) goto done; } - msg_ctx = messaging_init(mem_ctx, server_id_self(), ev_ctx); + msg_ctx = messaging_init(mem_ctx, procid_self(), ev_ctx); if (msg_ctx == NULL) { d_fprintf(stderr, "ERROR: could not init messaging context\n"); goto done; diff --git a/source3/utils/net_g_lock.c b/source3/utils/net_g_lock.c index f30ed331be..7632302cea 100644 --- a/source3/utils/net_g_lock.c +++ b/source3/utils/net_g_lock.c @@ -35,7 +35,7 @@ static bool net_g_lock_init(TALLOC_CTX *mem_ctx, d_fprintf(stderr, "ERROR: could not init event context\n"); goto fail; } - msg = messaging_init(talloc_tos(), server_id_self(), ev); + msg = messaging_init(talloc_tos(), procid_self(), ev); if (msg == NULL) { d_fprintf(stderr, "ERROR: could not init messaging context\n"); goto fail; diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 4ccea26c3d..fc6e057f1c 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -1388,7 +1388,7 @@ int main(int argc, const char **argv) * shell needs 0. */ if (!(evt_ctx = tevent_context_init(NULL)) || - !(msg_ctx = messaging_init(NULL, server_id_self(), evt_ctx))) { + !(msg_ctx = messaging_init(NULL, procid_self(), evt_ctx))) { fprintf(stderr, "could not init messaging context\n"); TALLOC_FREE(frame); exit(1); -- cgit