summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-03 13:13:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:03:39 -0500
commit8e2d624a588552f5d06f21fe37281615f3ec6296 (patch)
tree72d45a64cf0e3defd2537fb08596df58233d90be /source4/smbd
parent6a92d816a7dc97b8ca8a1b2419c31515add5ac87 (diff)
downloadsamba-8e2d624a588552f5d06f21fe37281615f3ec6296.tar.gz
samba-8e2d624a588552f5d06f21fe37281615f3ec6296.tar.bz2
samba-8e2d624a588552f5d06f21fe37281615f3ec6296.zip
r24937: Merge tests spoolss RPC callbacks.
(This used to be commit 9b256a0ca232ea6e89771bf73a1adf877273a752)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/process_model.h2
-rw-r--r--source4/smbd/process_single.c2
-rw-r--r--source4/smbd/service_stream.c6
3 files changed, 7 insertions, 3 deletions
diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h
index 513e903781..19212606c1 100644
--- a/source4/smbd/process_model.h
+++ b/source4/smbd/process_model.h
@@ -67,6 +67,8 @@ struct process_model_critical_sizes {
int sizeof_model_ops;
};
+extern const struct model_ops single_ops;
+
#include "smbd/process_model_proto.h"
#endif /* __PROCESS_MODEL_H__ */
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index 65f5a7e375..5ba2c8df88 100644
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -87,7 +87,7 @@ static void single_set_title(struct event_context *ev, const char *title)
{
}
-static const struct model_ops single_ops = {
+const struct model_ops single_ops = {
.name = "single",
.model_init = single_model_init,
.new_task = single_new_task,
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 08c323fc0a..5117697f87 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -224,11 +224,13 @@ static void stream_accept_handler(struct event_context *ev, struct fd_event *fde
stream_new_connection, stream_socket);
}
-
-
/*
setup a listen stream socket
if you pass *port == 0, then a port > 1024 is used
+
+ FIXME: This function is TCP/IP specific - uses an int rather than
+ a string for the port. Should leave allocating a port nr
+ to the socket implementation - JRV20070903
*/
NTSTATUS stream_setup_socket(struct event_context *event_context,
const struct model_ops *model_ops,