From 626b2da5a9109cfa50b8bf471d5b0c59351cfc17 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 17 May 2008 00:02:28 +0200 Subject: 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 (This used to be commit 3777d0307b346bcf363ab5ad783e802682034a9a) --- source4/smbd/service_stream.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source4/smbd') diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h index 04d23a56f2..d57a54cdc9 100644 --- a/source4/smbd/service_stream.h +++ b/source4/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; }; -- cgit From 250478d0445cf56e8b0b4e876977a9ae968ff55b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 17 May 2008 00:01:05 +0200 Subject: smbd: pass down lp_ctx to stream_new_connection_merge() metze (This used to be commit 91e9062265a68e3a1fe5e092503ec44ae5ea034e) --- source4/smbd/service_stream.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/smbd') 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); -- cgit From 4f0db429588e550d97db21fc0c17231c2ea2a25d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 19:41:33 +0200 Subject: Use variables for source directory in a couple more places. (This used to be commit 56bb2907c67d55967f54ce74b029f05067a187c5) --- source4/smbd/config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 006135f818..b8b87ba435 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -5,7 +5,7 @@ PRIVATE_PROTO_HEADER = service_proto.h PRIVATE_DEPENDENCIES = \ MESSAGING samba-socket -service_OBJ_FILES = $(addprefix smbd/, \ +service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service.o \ service_stream.o \ service_task.o) @@ -13,7 +13,7 @@ service_OBJ_FILES = $(addprefix smbd/, \ [SUBSYSTEM::PIDFILE] PRIVATE_PROTO_HEADER = pidfile.h -PIDFILE_OBJ_FILES = smbd/pidfile.o +PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o ################################# # Start BINARY smbd @@ -34,8 +34,8 @@ PRIVATE_DEPENDENCIES = \ share \ CLUSTER -smbd_OBJ_FILES = smbd/server.o +smbd_OBJ_FILES = $(smbdsrcdir)/server.o -MANPAGES += smbd/smbd.8 +MANPAGES += $(smbdsrcdir)/smbd.8 # End BINARY smbd ################################# -- cgit From 137ec6e340610759ed0653b11eafb3f4243e2728 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 19:46:09 +0200 Subject: Use variables for source directory in a couple more places. (This used to be commit 2860a7db5968c7007522cdb300eba390da929ab8) --- source4/smbd/process_model.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index 48899078f7..d97462fced 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -8,7 +8,7 @@ SUBSYSTEM = process_model # End MODULE process_model_single ################################################ -process_model_single_OBJ_FILES = smbd/process_single.o +process_model_single_OBJ_FILES = $(smbdsrcdir)/process_single.o ################################################ # Start MODULE process_model_standard @@ -19,7 +19,7 @@ PRIVATE_DEPENDENCIES = SETPROCTITLE # End MODULE process_model_standard ################################################ -process_model_standard_OBJ_FILES = smbd/process_standard.o +process_model_standard_OBJ_FILES = $(smbdsrcdir)/process_standard.o ################################################ # Start MODULE process_model_thread @@ -30,7 +30,7 @@ PRIVATE_DEPENDENCIES = PTHREAD # End MODULE process_model_thread ################################################ -process_model_thread_OBJ_FILES = smbd/process_thread.o +process_model_thread_OBJ_FILES = $(smbdsrcdir)/process_thread.o ################################################ # Start MODULE process_model_prefork @@ -40,10 +40,10 @@ SUBSYSTEM = process_model # End MODULE process_model_thread ################################################ -process_model_prefork_OBJ_FILES = smbd/process_prefork.o +process_model_prefork_OBJ_FILES = $(smbdsrcdir)/process_prefork.o [SUBSYSTEM::process_model] PRIVATE_PROTO_HEADER = process_model_proto.h PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG -process_model_OBJ_FILES = smbd/process_model.o +process_model_OBJ_FILES = $(smbdsrcdir)/process_model.o -- cgit From 4c8756f147f8b9a2806fd76e4cb06bb99d391516 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 22:30:08 +0200 Subject: Create prototype headers from Makefile directory, without smb_build in the middle. (This used to be commit f4a77b96f9c17d853348b70794026e5b9e384942) --- source4/smbd/config.mk | 6 ++++-- source4/smbd/process_model.mk | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index b8b87ba435..f5f88ffa7d 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -1,7 +1,6 @@ # server subsystem [SUBSYSTEM::service] -PRIVATE_PROTO_HEADER = service_proto.h PRIVATE_DEPENDENCIES = \ MESSAGING samba-socket @@ -10,11 +9,14 @@ service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service_stream.o \ service_task.o) +$(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c)) + [SUBSYSTEM::PIDFILE] -PRIVATE_PROTO_HEADER = pidfile.h PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o +$(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c)) + ################################# # Start BINARY smbd [BINARY::smbd] diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index d97462fced..44e3f5b754 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -43,7 +43,8 @@ SUBSYSTEM = process_model process_model_prefork_OBJ_FILES = $(smbdsrcdir)/process_prefork.o [SUBSYSTEM::process_model] -PRIVATE_PROTO_HEADER = process_model_proto.h PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG process_model_OBJ_FILES = $(smbdsrcdir)/process_model.o + +$(call proto_header_template,$(smbdsrcdir)/process_model_proto.h,$(process_model_OBJ_FILES:.o=.c)) -- cgit From 4c70cda986c86fe536327321d04c29eca81b6409 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 23:02:47 +0200 Subject: Fix a couple (well, little more than that..) of typos. (This used to be commit a6b52119940a900fb0de3864b8bca94e2965cc24) --- source4/smbd/config.mk | 4 ++-- source4/smbd/process_model.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index f5f88ffa7d..e60f444456 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -9,13 +9,13 @@ service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service_stream.o \ service_task.o) -$(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c)) +$(eval $(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c))) [SUBSYSTEM::PIDFILE] PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o -$(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c)) +$(eval $(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c))) ################################# # Start BINARY smbd diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index 44e3f5b754..5ed8471a9d 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -47,4 +47,4 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG process_model_OBJ_FILES = $(smbdsrcdir)/process_model.o -$(call proto_header_template,$(smbdsrcdir)/process_model_proto.h,$(process_model_OBJ_FILES:.o=.c)) +$(eval $(call proto_header_template,$(smbdsrcdir)/process_model_proto.h,$(process_model_OBJ_FILES:.o=.c))) -- cgit