The Samba-Bugzilla – Attachment 8490 Details for
Bug 9598
some IRPC calls timeout
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patches cherry-picked from master
0001-bug9598-s4-process_single-Use-pid-fd-as-cluster_id-i.patch (text/plain), 1.98 KB, created by
Andrew Bartlett
on 2013-01-25 11:33:11 UTC
(
hide
)
Description:
patches cherry-picked from master
Filename:
MIME Type:
Creator:
Andrew Bartlett
Created:
2013-01-25 11:33:11 UTC
Size:
1.98 KB
patch
obsolete
>From 9b32574cae9381c3fbb52a1c7a0ed7e6cfe1fb4b Mon Sep 17 00:00:00 2001 >From: Andrew Bartlett <abartlet@samba.org> >Date: Fri, 25 Jan 2013 13:15:51 +1100 >Subject: [PATCH] bug9598: s4-process_single: Use pid,fd as cluster_id in > process_single just like process_prefork > >This avoids two different process single servers (say LDAP and the RPC server) sharing the same >server id. > >Fix-bug: https://bugzilla.samba.org/show_bug.cgi?id=9598 > >Reported-by: Matthieu Patou <mat@matws.net> >Reviewed-by: Matthieu Patou <mat@matws.net> >Signed-off-by: Andrew Bartlett <abartlett@samba.org> > >Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> >Autobuild-Date(master): Fri Jan 25 12:00:04 CET 2013 on sn-devel-104 >(cherry picked from commit c5db4eb9104f1a95220273ee2b0290d157053922) >--- > source4/smbd/process_single.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > >diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c >index 742eac1..ff67750 100644 >--- a/source4/smbd/process_single.c >+++ b/source4/smbd/process_single.c >@@ -49,6 +49,7 @@ static void single_accept_connection(struct tevent_context *ev, > { > NTSTATUS status; > struct socket_context *connected_socket; >+ pid_t pid = getpid(); > > /* accept an incoming connection. */ > status = socket_accept(listen_socket, &connected_socket); >@@ -71,10 +72,14 @@ static void single_accept_connection(struct tevent_context *ev, > > talloc_steal(private_data, connected_socket); > >- /* The cluster_id(0, fd) cannot collide with the incrementing >- * task below, as the first component is 0, not 1 */ >+ /* >+ * We use the PID so we cannot collide in with cluster ids >+ * generated in other single mode tasks, and, and won't >+ * collide with PIDs from process model standard because a the >+ * combination of pid/fd should be unique system-wide >+ */ > new_conn(ev, lp_ctx, connected_socket, >- cluster_id(0, socket_get_fd(connected_socket)), private_data); >+ cluster_id(pid, socket_get_fd(connected_socket)), private_data); > } > > /* >-- >1.7.11.7 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
abartlet
:
review+
Actions:
View
Attachments on
bug 9598
:
8488
|
8490
|
8502