diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-04-30 09:54:58 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:23 -0500 |
commit | 7b03af89637bcfad343e4d2aa8aad11fe2bbd55a (patch) | |
tree | 223041bb201de84c8757bcf0fe2df9eef7e1768e | |
parent | 68269bde7c0588a4202103b582ee78049fe89332 (diff) | |
download | samba-7b03af89637bcfad343e4d2aa8aad11fe2bbd55a.tar.gz samba-7b03af89637bcfad343e4d2aa8aad11fe2bbd55a.tar.bz2 samba-7b03af89637bcfad343e4d2aa8aad11fe2bbd55a.zip |
r6530: the server ID of a connection in the single process model should be
based on the new socket fd, not the listening socket!
this fixes locktest with -M single
(This used to be commit 3e1b2742db818629fb79d12d40279db8dd575279)
-rw-r--r-- | source4/smbd/process_single.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 8d26481a95..56b074a629 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -56,7 +56,7 @@ static void single_accept_connection(struct event_context *ev, talloc_steal(private, sock); - new_conn(ev, sock2, socket_get_fd(sock), private); + new_conn(ev, sock2, socket_get_fd(sock2), private); } /* |