summaryrefslogtreecommitdiff
path: root/source4/smbd/process_model.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-30 11:24:15 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-30 23:49:00 +1100
commit046d38faa5e78f2bdcfcdb3b1582427c2ecc80b8 (patch)
tree3212537bdd1e74cc2153aacb229cab99e2e290db /source4/smbd/process_model.h
parent3a7814826989b2ece34b8370c77bce9727814701 (diff)
downloadsamba-046d38faa5e78f2bdcfcdb3b1582427c2ecc80b8.tar.gz
samba-046d38faa5e78f2bdcfcdb3b1582427c2ecc80b8.tar.bz2
samba-046d38faa5e78f2bdcfcdb3b1582427c2ecc80b8.zip
s4-smbd: don't initialise process models more than once
this also removes the event_context parameter from process model initialisation. It isn't needed, and is confusing when a process model init can be called from more than one place, possibly with different event contexts. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/smbd/process_model.h')
-rw-r--r--source4/smbd/process_model.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h
index 1d3e32eb34..b5790316ec 100644
--- a/source4/smbd/process_model.h
+++ b/source4/smbd/process_model.h
@@ -26,6 +26,7 @@
#include "lib/socket/socket.h"
#include "smbd/service.h"
+#include "smbd/process_model_proto.h"
/* modules can use the following to determine if the interface has changed
* please increment the version number after each interface change
@@ -41,7 +42,7 @@ struct model_ops {
const char *name;
/* called at startup when the model is selected */
- void (*model_init)(struct tevent_context *);
+ void (*model_init)(void);
/* function to accept new connection */
void (*accept_connection)(struct tevent_context *,
@@ -78,7 +79,7 @@ struct process_model_critical_sizes {
extern const struct model_ops single_ops;
-const struct model_ops *process_model_startup(struct tevent_context *ev, const char *model);
+const struct model_ops *process_model_startup(const char *model);
NTSTATUS register_process_model(const void *_ops);
NTSTATUS process_model_init(struct loadparm_context *lp_ctx);