diff options
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/config.mk | 2 | ||||
| -rw-r--r-- | source4/smbd/process_model.c | 4 | ||||
| -rw-r--r-- | source4/smbd/process_model.h | 5 | ||||
| -rw-r--r-- | source4/smbd/process_model.mk | 2 | ||||
| -rw-r--r-- | source4/smbd/process_standard.c | 3 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index dc8afeba78..006135f818 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -22,7 +22,7 @@ INSTALLDIR = SBINDIR PRIVATE_DEPENDENCIES = \ process_model \ service \ - LIBSAMBA-CONFIG \ + LIBSAMBA-HOSTCONFIG \ LIBSAMBA-UTIL \ POPT_SAMBA \ PIDFILE \ diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index e267995596..e631975b37 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -79,7 +79,7 @@ _PUBLIC_ NTSTATUS register_process_model(const void *_ops) return NT_STATUS_OK; } -NTSTATUS process_model_init(struct loadparm_context *lp_ctx) +_PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx) { extern NTSTATUS process_model_standard_init(void); extern NTSTATUS process_model_prefork_init(void); @@ -98,7 +98,7 @@ NTSTATUS process_model_init(struct loadparm_context *lp_ctx) /* return the operations structure for a named backend of the specified type */ -const struct model_ops *process_model_byname(const char *name) +_PUBLIC_ const struct model_ops *process_model_byname(const char *name) { int i; diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h index 796c8ee17b..b545212091 100644 --- a/source4/smbd/process_model.h +++ b/source4/smbd/process_model.h @@ -77,6 +77,9 @@ struct process_model_critical_sizes { extern const struct model_ops single_ops; -#include "smbd/process_model_proto.h" +const struct model_ops *process_model_startup(struct event_context *ev, const char *model); +const struct model_ops *process_model_byname(const char *name); +NTSTATUS register_process_model(const void *_ops); +NTSTATUS process_model_init(struct loadparm_context *lp_ctx); #endif /* __PROCESS_MODEL_H__ */ diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index 638b280564..48899078f7 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -44,6 +44,6 @@ process_model_prefork_OBJ_FILES = smbd/process_prefork.o [SUBSYSTEM::process_model] PRIVATE_PROTO_HEADER = process_model_proto.h -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG process_model_OBJ_FILES = smbd/process_model.o diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index deb44c0a68..820859400e 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -204,9 +204,6 @@ _NORETURN_ static void standard_terminate(struct event_context *ev, const char * which makes leak checking easier */ reload_charcnv(global_loadparm); - /* the secrets db should really hang off the connection structure */ - secrets_shutdown(); - talloc_free(ev); /* terminate this process */ diff --git a/source4/smbd/server.c b/source4/smbd/server.c index ded84f2426..e1ebd133ce 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -289,7 +289,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ /* Do *not* remove this, until you have removed * passdb/secrets.c, and proved that Samba still builds... */ /* Setup the SECRETS subsystem */ - if (!secrets_init(cmdline_lp_ctx)) { + if (secrets_init(talloc_autofree_context(), cmdline_lp_ctx) == NULL) { exit(1); } |