diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-17 02:55:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:57 -0500 |
| commit | fef617c31bd4a8be09449d6bc726c729ae758423 (patch) | |
| tree | 4951f62b04442e046f786b88e76dc48aac901e3f /source4/smbd/service.c | |
| parent | f6da6a10de7d7f101f6485f4a34ef4ef5b6ab6c0 (diff) | |
| download | samba-fef617c31bd4a8be09449d6bc726c729ae758423.tar.gz samba-fef617c31bd4a8be09449d6bc726c729ae758423.tar.bz2 samba-fef617c31bd4a8be09449d6bc726c729ae758423.zip | |
r3012: added initial support for byte range locking in the posix vfs. This is
enough for us to pass locktest, but does not yet support lock timeouts
and some of the other esoteric features.
(This used to be commit 58a92abd88f190bc60894a68e0528e95ae33fe39)
Diffstat (limited to 'source4/smbd/service.c')
| -rw-r--r-- | source4/smbd/service.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/smbd/service.c b/source4/smbd/service.c index 5aae84b2c9..9a7ac73559 100644 --- a/source4/smbd/service.c +++ b/source4/smbd/service.c @@ -198,7 +198,8 @@ static int server_destructor(void *ptr) struct server_connection *server_setup_connection(struct event_context *ev, struct server_socket *server_socket, struct socket_context *sock, - time_t t) + time_t t, + servid_t server_id) { struct fd_event fde; struct timed_event idle; @@ -206,7 +207,7 @@ struct server_connection *server_setup_connection(struct event_context *ev, srv_conn = talloc_p(server_socket, struct server_connection); if (!srv_conn) { - DEBUG(0,("talloc_p(mem_ctx, struct server_service_connection) failed\n")); + DEBUG(0,("talloc_p(mem_ctx, struct server_connection) failed\n")); return NULL; } @@ -229,6 +230,7 @@ struct server_connection *server_setup_connection(struct event_context *ev, srv_conn->server_socket = server_socket; srv_conn->service = server_socket->service; srv_conn->socket = sock; + srv_conn->server_id = server_id; /* create a smb server context and add it to out event handling */ |