The branch, master has been updated
via 9a2db48 s3: Remove some calls to procid_self
from 7d05ff7 s3:smbd:durable: store stat info for disconnected durables
and check at reconnect.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9a2db48e7ebe808019d1bd2bfc2bd3c77204d4b2
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 19 07:15:31 2012 +0200
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 <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Fri Oct 19 20:39:56 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/printing/spoolssd.c | 6 +++---
source3/rpc_server/epmd.c | 2 +-
source3/rpc_server/lsasd.c | 12 +++++++-----
3 files changed, 11 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index bb043bd..db303a1 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 f30372e..0e7b430 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 fd6c248..a1ac49a 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);
}
--
Samba Shared Repository
