summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-10-19 07:15:31 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-10-19 20:39:56 +0200
commit9a2db48e7ebe808019d1bd2bfc2bd3c77204d4b2 (patch)
treef5780e11a5555a6fbffeb75e4137b662ba40508d
parent7d05ff77264cf48d1ee82ca19c8c7e6951e64cf5 (diff)
downloadsamba-9a2db48e7ebe808019d1bd2bfc2bd3c77204d4b2.tar.gz
samba-9a2db48e7ebe808019d1bd2bfc2bd3c77204d4b2.tar.bz2
samba-9a2db48e7ebe808019d1bd2bfc2bd3c77204d4b2.zip
s3: Remove some calls to procid_self
The goal is to have procid_self handling completely in the messaging_context. Signed-off-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Fri Oct 19 20:39:56 CEST 2012 on sn-devel-104
-rw-r--r--source3/printing/spoolssd.c6
-rw-r--r--source3/rpc_server/epmd.c2
-rw-r--r--source3/rpc_server/lsasd.c12
3 files changed, 11 insertions, 9 deletions
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index bb043bdba7..db303a1b0b 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -301,7 +301,7 @@ static bool spoolss_child_init(struct tevent_context *ev_ctx,
return false;
}
- if (!serverid_register(procid_self(),
+ if (!serverid_register(messaging_server_id(msg_ctx),
FLAG_MSG_GENERAL |
FLAG_MSG_PRINT_GENERAL)) {
return false;
@@ -671,7 +671,7 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx,
}
/* save the parent process id so the children can use it later */
- parent_id = procid_self();
+ parent_id = messaging_server_id(msg_ctx);
spoolss_reopen_logs(0);
pfh_daemon_config(DAEMON_NAME,
@@ -717,7 +717,7 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx,
exit(1);
}
- if (!serverid_register(procid_self(),
+ if (!serverid_register(messaging_server_id(msg_ctx),
FLAG_MSG_GENERAL |
FLAG_MSG_PRINT_GENERAL)) {
exit(1);
diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index f30372edad..0e7b430213 100644
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -173,7 +173,7 @@ void start_epmd(struct tevent_context *ev_ctx,
epmd_setup_sig_term_handler(ev_ctx);
epmd_setup_sig_hup_handler(ev_ctx, msg_ctx);
- ok = serverid_register(procid_self(),
+ ok = serverid_register(messaging_server_id(msg_ctx),
FLAG_MSG_GENERAL |
FLAG_MSG_PRINT_GENERAL);
if (!ok) {
diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index fd6c248294..a1ac49a47a 100644
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -261,7 +261,8 @@ static bool lsasd_child_init(struct tevent_context *ev_ctx,
return false;
}
- if (!serverid_register(procid_self(), FLAG_MSG_GENERAL)) {
+ if (!serverid_register(messaging_server_id(msg_ctx),
+ FLAG_MSG_GENERAL)) {
return false;
}
@@ -878,9 +879,6 @@ void start_lsasd(struct tevent_context *ev_ctx,
return;
}
- /* save the parent process id so the children can use it later */
- parent_id = procid_self();
-
status = reinit_after_fork(msg_ctx,
ev_ctx,
true);
@@ -889,6 +887,9 @@ void start_lsasd(struct tevent_context *ev_ctx,
smb_panic("reinit_after_fork() failed");
}
+ /* save the parent process id so the children can use it later */
+ parent_id = messaging_server_id(msg_ctx);
+
lsasd_reopen_logs(0);
pfh_daemon_config(DAEMON_NAME,
&pf_lsasd_cfg,
@@ -920,7 +921,8 @@ void start_lsasd(struct tevent_context *ev_ctx,
exit(1);
}
- if (!serverid_register(procid_self(), FLAG_MSG_GENERAL)) {
+ if (!serverid_register(messaging_server_id(msg_ctx),
+ FLAG_MSG_GENERAL)) {
exit(1);
}