The branch, v4-0-test has been updated
via 91e9062265a68e3a1fe5e092503ec44ae5ea034e (commit)
via 3777d0307b346bcf363ab5ad783e802682034a9a (commit)
from 7f26a5425e706a97cc07c5139b3fea4fde9e4020 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 91e9062265a68e3a1fe5e092503ec44ae5ea034e
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Sat May 17 00:01:05 2008 +0200
smbd: pass down lp_ctx to stream_new_connection_merge()
metze
commit 3777d0307b346bcf363ab5ad783e802682034a9a
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Sat May 17 00:02:28 2008 +0200
smbd: add session_info to struct stream_connection
NULL represents an anoymous connection, as that's
cheaper than always calling auth_anonymous_session_info(),
That means if the caller wants to use the transport layer
session_info he should call auth_anonymous_session_info()
to create the session info.
metze
-----------------------------------------------------------------------
Summary of changes:
source/smbd/service_stream.c | 2 ++
source/smbd/service_stream.h | 6 ++++++
source/wrepl_server/wrepl_in_connection.c | 2 +-
3 files changed, 9 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/service_stream.c b/source/smbd/service_stream.c
index 9f744ef..e27d87e 100644
--- a/source/smbd/service_stream.c
+++ b/source/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);
diff --git a/source/smbd/service_stream.h b/source/smbd/service_stream.h
index 04d23a5..d57a54c 100644
--- a/source/smbd/service_stream.h
+++ b/source/smbd/service_stream.h
@@ -50,6 +50,12 @@ struct stream_connection {
struct messaging_context *msg_ctx;
struct loadparm_context *lp_ctx;
+ /*
+ * this transport layer session info, normally NULL
+ * which means the same as an anonymous session info
+ */
+ struct auth_session_info *session_info;
+
bool processing;
const char *terminate;
};
diff --git a/source/wrepl_server/wrepl_in_connection.c
b/source/wrepl_server/wrepl_in_connection.c
index 34d94d7..2522748 100644
--- a/source/wrepl_server/wrepl_in_connection.c
+++ b/source/wrepl_server/wrepl_in_connection.c
@@ -230,7 +230,7 @@ NTSTATUS wreplsrv_in_connection_merge(struct
wreplsrv_partner *partner,
wrepl_in->service = service;
wrepl_in->partner = partner;
- status = stream_new_connection_merge(service->task->event_ctx,
model_ops,
+ status = stream_new_connection_merge(service->task->event_ctx,
service->task->lp_ctx, model_ops,
sock, &wreplsrv_stream_ops,
service->task->msg_ctx,
wrepl_in, &conn);
NT_STATUS_NOT_OK_RETURN(status);
--
Samba Shared Repository
