diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-17 21:16:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-17 21:16:22 +1000 |
| commit | d975cd9d8c3fc504a8ccbb80f239d4648ac0c304 (patch) | |
| tree | 8272375ede8a170bdd7b09d48db833248c65a54d /source4/smbd/service_stream.c | |
| parent | fd0d47b746be322b60fca29c1daa13e72b360e62 (diff) | |
| parent | 250478d0445cf56e8b0b4e876977a9ae968ff55b (diff) | |
| download | samba-d975cd9d8c3fc504a8ccbb80f239d4648ac0c304.tar.gz samba-d975cd9d8c3fc504a8ccbb80f239d4648ac0c304.tar.bz2 samba-d975cd9d8c3fc504a8ccbb80f239d4648ac0c304.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 60579269d1e0bebce5b595ef95d68fd4bf781cfd)
Diffstat (limited to 'source4/smbd/service_stream.c')
| -rw-r--r-- | source4/smbd/service_stream.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 9f744efa81..e27d87ec75 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -119,6 +119,7 @@ void stream_io_handler_callback(void *private, uint16_t flags) a server connection */ NTSTATUS stream_new_connection_merge(struct event_context *ev, + struct loadparm_context *lp_ctx, const struct model_ops *model_ops, struct socket_context *sock, const struct stream_server_ops *stream_ops, @@ -140,6 +141,7 @@ NTSTATUS stream_new_connection_merge(struct event_context *ev, srv_conn->ops = stream_ops; srv_conn->msg_ctx = msg_ctx; srv_conn->event.ctx = ev; + srv_conn->lp_ctx = lp_ctx; srv_conn->event.fde = event_add_fd(ev, srv_conn, socket_get_fd(sock), EVENT_FD_READ, stream_io_handler_fde, srv_conn); |