From 0f9d14820e222233d63b7a79b4b1ff044332ef41 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 12 Dec 2011 14:55:54 +0100
Subject: s3: Remove a bunch of calls to procid_self()

All callers to messaging_[re]init only used procid_self()
---
 source3/utils/dbwrap_tool.c    | 2 +-
 source3/utils/dbwrap_torture.c | 2 +-
 source3/utils/net.c            | 3 +--
 source3/utils/net_g_lock.c     | 4 ++--
 source3/utils/net_registry.c   | 2 +-
 source3/utils/smbcontrol.c     | 2 +-
 source3/utils/status.c         | 3 +--
 7 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'source3/utils')

diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index fe4e6ebef4..7850dc168e 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -457,7 +457,7 @@ int main(int argc, const char **argv)
 		goto done;
 	}
 
-	msg_ctx = messaging_init(mem_ctx, procid_self(), evt_ctx);
+	msg_ctx = messaging_init(mem_ctx, 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 3ce1f53b41..9907f31f76 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -292,7 +292,7 @@ int main(int argc, const char *argv[])
 		goto done;
 	}
 
-	msg_ctx = messaging_init(mem_ctx, procid_self(), ev_ctx);
+	msg_ctx = messaging_init(mem_ctx, ev_ctx);
 	if (msg_ctx == NULL) {
 		d_fprintf(stderr, "ERROR: could not init messaging context\n");
 		goto done;
diff --git a/source3/utils/net.c b/source3/utils/net.c
index ce9e7c57b2..70ed0aa47a 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -948,8 +948,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, procid_self(),
-				    event_context_init(c));
+	c->msg_ctx = messaging_init(c, event_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 f8a7a8b620..b9d99160bc 100644
--- a/source3/utils/net_g_lock.c
+++ b/source3/utils/net_g_lock.c
@@ -36,7 +36,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(mem_ctx, procid_self(), ev);
+	msg = messaging_init(mem_ctx, ev);
 	if (msg == NULL) {
 		d_fprintf(stderr, "ERROR: could not init messaging context\n");
 		goto fail;
@@ -91,7 +91,7 @@ static int net_g_lock_do(struct net_context *c, int argc, const char **argv)
 
 	status = g_lock_do(name, G_LOCK_WRITE,
 			   timeval_set(timeout / 1000, timeout % 1000),
-			   procid_self(), net_g_lock_do_fn, &state);
+			   net_g_lock_do_fn, &state);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "ERROR: g_lock_do failed: %s\n",
 			  nt_errstr(status));
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 3c9177df52..90b0d19ff4 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -642,7 +642,7 @@ static int net_registry_increment(struct net_context *c, int argc,
 	}
 
 	status = g_lock_do("registry_increment_lock", G_LOCK_WRITE,
-			   timeval_set(600, 0), procid_self(),
+			   timeval_set(600, 0),
 			   net_registry_increment_fn, &state);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, _("g_lock_do failed: %s\n"),
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 97161a09bc..747c35ceba 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1478,7 +1478,7 @@ int main(int argc, const char **argv)
          * shell needs 0. */ 
 
 	if (!(evt_ctx = tevent_context_init(NULL)) ||
-	    !(msg_ctx = messaging_init(NULL, procid_self(), evt_ctx))) {
+	    !(msg_ctx = messaging_init(NULL, evt_ctx))) {
 		fprintf(stderr, "could not init messaging context\n");
 		TALLOC_FREE(frame);
 		exit(1);
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 8bae5bc1ae..76f6167570 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -386,8 +386,7 @@ static int traverse_sessionid(const char *key, struct sessionid *session,
 		 * connection, usable by the db_open() calls further
 		 * down.
 		 */
-		msg_ctx = messaging_init(NULL, procid_self(),
-					 event_context_init(NULL));
+		msg_ctx = messaging_init(NULL, event_context_init(NULL));
 		if (msg_ctx == NULL) {
 			fprintf(stderr, "messaging_init failed\n");
 			ret = -1;
-- 
cgit